From 6109d74b8a7c252dae380eb4c1de7a802e7d17db Mon Sep 17 00:00:00 2001 From: tobrun Date: Tue, 18 Feb 2020 14:01:17 +0100 Subject: [PATCH] [build] remove buck, update to latest gl-native --- .circleci/config.yml | 35 +---- misc/buck/.buckconfig | 15 --- misc/buck/mapbox-gl-native/Android.mk | 4 - misc/buck/mapbox-gl-native/Application.mk | 2 - misc/buck/mapbox-gl-native/BUCK | 140 -------------------- misc/buck/mapbox-gl-native/include | 1 - misc/buck/mapbox-gl-native/mapbox-gl-native | 1 - misc/buck/mapbox-gl-native/platform | 1 - misc/buck/mapbox-gl-native/sdk | 1 - misc/buck/mapbox-gl-native/src | 1 - misc/buck/mapbox-gl-native/vendor | 1 - misc/buck/mapbox-gl-native/vendor-android | 1 - vendor/mapbox-gl-native | 2 +- 13 files changed, 2 insertions(+), 203 deletions(-) delete mode 100644 misc/buck/.buckconfig delete mode 100644 misc/buck/mapbox-gl-native/Android.mk delete mode 100644 misc/buck/mapbox-gl-native/Application.mk delete mode 100644 misc/buck/mapbox-gl-native/BUCK delete mode 120000 misc/buck/mapbox-gl-native/include delete mode 120000 misc/buck/mapbox-gl-native/mapbox-gl-native delete mode 120000 misc/buck/mapbox-gl-native/platform delete mode 120000 misc/buck/mapbox-gl-native/sdk delete mode 120000 misc/buck/mapbox-gl-native/src delete mode 120000 misc/buck/mapbox-gl-native/vendor delete mode 120000 misc/buck/mapbox-gl-native/vendor-android diff --git a/.circleci/config.yml b/.circleci/config.yml index 4d8d3f482..3afb5a441 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,16 +4,8 @@ workflows: version: 2 mapbox-gl-native-android: jobs: - - android-debug-arm-v7-buck - android-arm-template: name: android-debug-arm-v8 - - android-arm-template: - name: android-gnustl-arm-v7 - stl: gnustl_shared - firebase_device_id: "flo" - firebase_device_os: "21" - image: android-ndk-r17c:1d5db0eb34 - abi: arm-v7 - android-release: filters: tags: @@ -345,29 +337,4 @@ jobs: make run-android-upload-to-artifactory fi fi - - generate-api-javadoc - # ------------------------------------------------------------------------------ - 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 - - npm-install - - run: - name: Checkout submodules - command: | - git submodule update --init --recursive - - npm-install-vendor - - prepare-environment - - run: - name: Build Android library - command: | - cd misc/buck - buck build mapbox-gl-native:android-core - # ------------------------------------------------------------------------------ \ No newline at end of file + - generate-api-javadoc \ No newline at end of file diff --git a/misc/buck/.buckconfig b/misc/buck/.buckconfig deleted file mode 100644 index f8d656612..000000000 --- a/misc/buck/.buckconfig +++ /dev/null @@ -1,15 +0,0 @@ -[ndk] -cpu_abis = armv7 -compiler = clang -app_platform = android-14 - -[project] -ignore = .git -allow_symlinks = allow - -[cxx] -default_platform = iphonesimulator-x86_64 - -[apple] -iphonesimulator_target_sdk_version = 9.0 -iphoneos_target_sdk_version = 9.0 \ No newline at end of file diff --git a/misc/buck/mapbox-gl-native/Android.mk b/misc/buck/mapbox-gl-native/Android.mk deleted file mode 100644 index ba1e2dd70..000000000 --- a/misc/buck/mapbox-gl-native/Android.mk +++ /dev/null @@ -1,4 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) -LOCAL_MODULE := android-core -include $(BUILD_SHARED_LIBRARY) diff --git a/misc/buck/mapbox-gl-native/Application.mk b/misc/buck/mapbox-gl-native/Application.mk deleted file mode 100644 index a11b28deb..000000000 --- a/misc/buck/mapbox-gl-native/Application.mk +++ /dev/null @@ -1,2 +0,0 @@ -APP_ABI := armeabi-v7a -APP_PLATFORM := android-14 diff --git a/misc/buck/mapbox-gl-native/BUCK b/misc/buck/mapbox-gl-native/BUCK deleted file mode 100644 index 30695821e..000000000 --- a/misc/buck/mapbox-gl-native/BUCK +++ /dev/null @@ -1,140 +0,0 @@ -# BUILD FILE SYNTAX: SKYLARK - -import json - -mbgl_base_path = get_base_path() or '.' -android_base_path = '../../' - -def mbgl_load_file_lists(*argv): - merged = dict(sources = [], public_headers = {}, private_headers = {}) - for arg in argv: - filename = mbgl_base_path + '/' + arg + '-files.json' - add_build_file_dep('//' + filename) - files = json.load(open(filename)) - merged['public_headers'].update(files['public_headers']) - merged['private_headers'].update(files['private_headers']) - merged['sources'] += files['sources'] - return merged - -def android_load_file_lists(*argv): - merged = dict(sources = [], public_headers = {}, private_headers = {}) - for arg in argv: - filename = '../../' + arg + '-files.json' - add_build_file_dep('//' + filename) - files = json.load(open(filename)) - merged['public_headers'].update(files['public_headers']) - merged['private_headers'].update(files['private_headers']) - merged['sources'] += files['sources'] - return merged - -mbgl = dict( - core = mbgl_load_file_lists('src/core', 'platform/default/filesource'), - android = android_load_file_lists('core', 'filesource'), - deps = [], -) - -def mbgl_vendor_library(name): - files = mbgl_load_file_lists('vendor/' + name) - cxx_library( - name = "vendor-" + name, - header_namespace = "", - srcs = files['sources'], - headers = files['private_headers'], - exported_headers = files['public_headers'], - link_style = 'static', - compiler_flags = [ - "-Wno-tautological-unsigned-enum-zero-compare", - ], - ) - mbgl['deps'].append(':vendor-' + name) - -mbgl_vendor_library("icu") -mbgl_vendor_library("boost") -mbgl_vendor_library("cheap-ruler-cpp") -mbgl_vendor_library("earcut.hpp") -mbgl_vendor_library("eternal") -mbgl_vendor_library("geojson-vt-cpp") -mbgl_vendor_library("mapbox-base") -mbgl_vendor_library("sqlite") -mbgl_vendor_library("polylabel") -mbgl_vendor_library("protozero") -mbgl_vendor_library("shelf-pack-cpp") -mbgl_vendor_library("unique_resource") -mbgl_vendor_library("vector-tile") -mbgl_vendor_library("wagyu") - -cxx_library( - name = "core", - - srcs = mbgl['core']['sources'], - platform_srcs = [ - ("android", mbgl['android']['sources']), - ], - - header_namespace = "", - headers = mbgl['core']['private_headers'], - exported_headers = mbgl['core']['public_headers'], - platform_headers = [ - ("android", mbgl['android']['private_headers']) - ], - exported_platform_headers = [ - ("android", mbgl['android']['public_headers']), - ], - - compiler_flags = [ - "-std=c++14", - "-g", - "-Wall", - "-Wextra", - "-Werror", - "-Wno-unused-variable", - "-Wno-unused-parameter", - "-Wno-c++11-narrowing", - "-Wno-tautological-constant-compare", - "-fexceptions", - "-ftemplate-depth=1024", - "-frtti", - ], - - preprocessor_flags = [ - "-DMBGL_USE_GLES2=1", - "-DMBGL_VERSION_REV=\"standalone\"", - "-DRAPIDJSON_HAS_STDSTRING=1", - ], - exported_platform_linker_flags = [ - ("android", [ - "-lz", - "-lEGL", - "-lGLESv2", - "-landroid", - "-ljnigraphics", - "-llog", - "-fvisibility=hidden", - "-Wl,--icf=safe", - "-Wl,--version-script=" + android_base_path + "version-script" - ]), - ], - - visibility = ["PUBLIC"], - deps = mbgl['deps'], - soname = "libmapbox-gl.$(ext)", -) - -ndk_library( - name = "android-core", - deps = [ ":core" ], - flags = [ - "NDK_APPLICATION_MK=$(env PWD)/" + mbgl_base_path + "/Application.mk", - ], -) - -android_manifest( - name = 'android-manifest', - skeleton = 'sdk/src/main/AndroidManifest.xml', -) - -android_library( - name = "android", - deps = [ ":android-core" ], - manifest = ":android-manifest", -) \ No newline at end of file diff --git a/misc/buck/mapbox-gl-native/include b/misc/buck/mapbox-gl-native/include deleted file mode 120000 index aabe3d4b8..000000000 --- a/misc/buck/mapbox-gl-native/include +++ /dev/null @@ -1 +0,0 @@ -../../../vendor/mapbox-gl-native/include \ No newline at end of file diff --git a/misc/buck/mapbox-gl-native/mapbox-gl-native b/misc/buck/mapbox-gl-native/mapbox-gl-native deleted file mode 120000 index e0ea80599..000000000 --- a/misc/buck/mapbox-gl-native/mapbox-gl-native +++ /dev/null @@ -1 +0,0 @@ -../../../vendor/mapbox-gl-native \ No newline at end of file diff --git a/misc/buck/mapbox-gl-native/platform b/misc/buck/mapbox-gl-native/platform deleted file mode 120000 index d05709529..000000000 --- a/misc/buck/mapbox-gl-native/platform +++ /dev/null @@ -1 +0,0 @@ -../../../vendor/mapbox-gl-native/platform \ No newline at end of file diff --git a/misc/buck/mapbox-gl-native/sdk b/misc/buck/mapbox-gl-native/sdk deleted file mode 120000 index 468e979db..000000000 --- a/misc/buck/mapbox-gl-native/sdk +++ /dev/null @@ -1 +0,0 @@ -../../../MapboxGLAndroidSDK \ No newline at end of file diff --git a/misc/buck/mapbox-gl-native/src b/misc/buck/mapbox-gl-native/src deleted file mode 120000 index 86b9c406a..000000000 --- a/misc/buck/mapbox-gl-native/src +++ /dev/null @@ -1 +0,0 @@ -../../../vendor/mapbox-gl-native/src \ No newline at end of file diff --git a/misc/buck/mapbox-gl-native/vendor b/misc/buck/mapbox-gl-native/vendor deleted file mode 120000 index 8272665fb..000000000 --- a/misc/buck/mapbox-gl-native/vendor +++ /dev/null @@ -1 +0,0 @@ -../../../vendor/mapbox-gl-native/vendor \ No newline at end of file diff --git a/misc/buck/mapbox-gl-native/vendor-android b/misc/buck/mapbox-gl-native/vendor-android deleted file mode 120000 index c73e2c9ac..000000000 --- a/misc/buck/mapbox-gl-native/vendor-android +++ /dev/null @@ -1 +0,0 @@ -../../../vendor \ No newline at end of file diff --git a/vendor/mapbox-gl-native b/vendor/mapbox-gl-native index a23100586..a551f70c6 160000 --- a/vendor/mapbox-gl-native +++ b/vendor/mapbox-gl-native @@ -1 +1 @@ -Subproject commit a23100586098c2d44682444cdd31001f1eba5859 +Subproject commit a551f70c6da8973f23e10cf19b630376553ab699