Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Add a Buck build and BUCK file for Android #13584

Merged
merged 2 commits into from
Jan 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,14 @@ test/fixtures/api/assets.zip
test/fixtures/storage/assets.zip
/.circle-week
/vendor/.cache
buck-out
.buckd

# Visual Studio Code
.vscode
mapbox-gl-native.code-workspace

# Generated list files from code generation
/scripts/generate-cmake-files.list
/scripts/generate-file-lists.list
/scripts/generate-shaders.list
/scripts/generate-style-code.list
23 changes: 23 additions & 0 deletions benchmark/benchmark-files.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"//": "This file is generated. Do not edit. Regenerate it with scripts/generate-file-lists.js",
"sources": [
"benchmark/api/query.benchmark.cpp",
"benchmark/api/render.benchmark.cpp",
"benchmark/function/camera_function.benchmark.cpp",
"benchmark/function/composite_function.benchmark.cpp",
"benchmark/function/source_function.benchmark.cpp",
"benchmark/parse/filter.benchmark.cpp",
"benchmark/parse/tile_mask.benchmark.cpp",
"benchmark/parse/vector_tile.benchmark.cpp",
"benchmark/src/main.cpp",
"benchmark/src/mbgl/benchmark/benchmark.cpp",
"benchmark/util/dtoa.benchmark.cpp",
"benchmark/util/tilecover.benchmark.cpp"
],
"public_headers": {
"mbgl/benchmark.hpp": "benchmark/include/mbgl/benchmark.hpp"
},
"private_headers": {
"mbgl/benchmark/stub_geometry_tile_feature.hpp": "benchmark/src/mbgl/benchmark/stub_geometry_tile_feature.hpp"
}
}
25 changes: 23 additions & 2 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ workflows:
filters:
branches:
ignore: master
- android-debug-arm-v7-buck
- android-arm-v7-template:
name: android-debug-arm-v7
- android-arm-v7-template:
Expand Down Expand Up @@ -473,8 +474,8 @@ jobs:
command: scripts/nitpick/submodule-pin.js
when: always
- run:
name: CMake file list generation
command: scripts/nitpick/generated-code.js cmake
name: Source file list generation
command: scripts/nitpick/generated-code.js sources
when: always
- run:
name: Shader code generation
Expand Down Expand Up @@ -650,6 +651,26 @@ jobs:
if [[ $CIRCLE_BRANCH == master ]] || [[ $CIRCLE_BRANCH == release-* ]] || [[ $CIRCLE_TAG == android-v* ]]; then
make run-android-upload-archives
fi
# ------------------------------------------------------------------------------
android-debug-arm-v7-buck:
docker:
- image: mbgl/android-ndk-r17c-buck:07c5ef2e71
working_directory: /src
environment:
LIBSYSCONFCPUS: 2
JOBS: 2
BUILDTYPE: Debug
ANDROID_NDK: /android/sdk/ndk-bundle
steps:
- checkout
- run:
name: Checkout submodules
command: git submodule update --init
- run:
name: Build Android library
command: |
cd misc/buck
buck build mapbox-gl-native:android-core

# ------------------------------------------------------------------------------
node-clang39-release:
Expand Down
25 changes: 0 additions & 25 deletions cmake/benchmark-files.txt

This file was deleted.

4 changes: 2 additions & 2 deletions cmake/benchmark.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Modify cmake/benchmark-files.txt to change the source files for this target.
load_sources_list(MBGL_BENCHMARK_FILES cmake/benchmark-files.txt)
# Run scripts/generate-file-lists.js to change the source files for this target.
load_sources_list(MBGL_BENCHMARK_FILES benchmark/benchmark-files.json)
add_executable(mbgl-benchmark ${MBGL_BENCHMARK_FILES})

target_include_directories(mbgl-benchmark
Expand Down
Loading