diff options
| author | 2020-11-05 00:18:52 +0000 | |
|---|---|---|
| committer | 2020-11-05 00:18:52 +0000 | |
| commit | cc236a20518ac017c6de646b4c37620c36091f17 (patch) | |
| tree | a72d8c0c37dda005da5e74fa0dcbac3558650dcd | |
| parent | bf3ed6ca9c1e4901387841a9e86a6f23e2d89155 (diff) | |
| parent | f856a98c317ce00d9ae4452606fbc85fb2ec7010 (diff) | |
Merge "Disable libbinder darwin builds"
| -rw-r--r-- | libs/android_runtime_lazy/Android.bp | 5 | ||||
| -rw-r--r-- | libs/binder/Android.bp | 8 | ||||
| -rw-r--r-- | libs/binder/ndk/Android.bp | 6 | ||||
| -rw-r--r-- | libs/binder/parcel_fuzzer/Android.bp | 5 | ||||
| -rw-r--r-- | libs/binder/rust/Android.bp | 13 | ||||
| -rw-r--r-- | libs/binder/tests/fuzzers/Android.bp | 5 | ||||
| -rw-r--r-- | libs/binderthreadstate/Android.bp | 5 | ||||
| -rw-r--r-- | libs/fakeservicemanager/Android.bp | 5 | ||||
| -rw-r--r-- | libs/gralloc/types/Android.bp | 5 | ||||
| -rw-r--r-- | libs/gralloc/types/fuzzer/Android.bp | 5 |
10 files changed, 62 insertions, 0 deletions
diff --git a/libs/android_runtime_lazy/Android.bp b/libs/android_runtime_lazy/Android.bp index 09a5f39130..cdd776480c 100644 --- a/libs/android_runtime_lazy/Android.bp +++ b/libs/android_runtime_lazy/Android.bp @@ -35,6 +35,11 @@ cc_library { vendor_available: true, double_loadable: true, host_supported: true, + target: { + darwin: { + enabled: false, + } + }, cflags: [ "-Wall", diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp index d363ee9ea4..e6071a06df 100644 --- a/libs/binder/Android.bp +++ b/libs/binder/Android.bp @@ -31,6 +31,11 @@ cc_library_headers { "libutils_headers", ], min_sdk_version: "29", + target: { + darwin: { + enabled: false, + }, + }, } // These interfaces are android-specific implementation unrelated to binder @@ -122,6 +127,9 @@ cc_library { vendor: { exclude_srcs: libbinder_device_interface_sources, }, + darwin: { + enabled: false, + }, }, aidl: { diff --git a/libs/binder/ndk/Android.bp b/libs/binder/ndk/Android.bp index e4d86ae8b9..cecc75904a 100644 --- a/libs/binder/ndk/Android.bp +++ b/libs/binder/ndk/Android.bp @@ -26,6 +26,9 @@ cc_defaults { "-D__ANDROID_API__=10000", ], }, + darwin: { + enabled: false, + }, }, } @@ -84,6 +87,9 @@ cc_library { linux: { version_script: "libbinder_ndk.map.txt", }, + darwin: { + enabled: false, + }, }, stubs: { symbol_file: "libbinder_ndk.map.txt", diff --git a/libs/binder/parcel_fuzzer/Android.bp b/libs/binder/parcel_fuzzer/Android.bp index c5b3d8049b..3e6fe99541 100644 --- a/libs/binder/parcel_fuzzer/Android.bp +++ b/libs/binder/parcel_fuzzer/Android.bp @@ -52,6 +52,11 @@ cc_fuzz { cc_library_static { name: "libbinder_random_parcel", host_supported: true, + target: { + darwin: { + enabled: false, + } + }, srcs: [ "random_fd.cpp", "random_parcel.cpp", diff --git a/libs/binder/rust/Android.bp b/libs/binder/rust/Android.bp index dc8270eeeb..fd5f2f5d9c 100644 --- a/libs/binder/rust/Android.bp +++ b/libs/binder/rust/Android.bp @@ -10,6 +10,11 @@ rust_library { "libbinder_ndk_sys", ], host_supported: true, + target: { + darwin: { + enabled: false, + } + } } rust_library { @@ -23,6 +28,11 @@ rust_library { "libbinder_ndk", ], host_supported: true, + target: { + darwin: { + enabled: false, + } + } } rust_bindgen { @@ -64,6 +74,9 @@ rust_bindgen { "-D__ANDROID_API__=10000", ], }, + darwin: { + enabled: false, + }, }, } diff --git a/libs/binder/tests/fuzzers/Android.bp b/libs/binder/tests/fuzzers/Android.bp index 46379fc629..c465bed250 100644 --- a/libs/binder/tests/fuzzers/Android.bp +++ b/libs/binder/tests/fuzzers/Android.bp @@ -26,6 +26,11 @@ cc_defaults { "libutils", "libbase", ], + target: { + darwin: { + enabled: false, + } + } } cc_fuzz { diff --git a/libs/binderthreadstate/Android.bp b/libs/binderthreadstate/Android.bp index 88752ee87e..08c62df072 100644 --- a/libs/binderthreadstate/Android.bp +++ b/libs/binderthreadstate/Android.bp @@ -19,6 +19,11 @@ cc_library_static { double_loadable: true, vendor_available: true, host_supported: true, + target: { + darwin: { + enabled: false, + } + }, shared_libs: [ "libbinder", diff --git a/libs/fakeservicemanager/Android.bp b/libs/fakeservicemanager/Android.bp index 69096373fd..76518c1286 100644 --- a/libs/fakeservicemanager/Android.bp +++ b/libs/fakeservicemanager/Android.bp @@ -9,6 +9,11 @@ cc_defaults { "libbinder", "libutils", ], + target: { + darwin: { + enabled: false, + }, + }, } cc_library { diff --git a/libs/gralloc/types/Android.bp b/libs/gralloc/types/Android.bp index cc31cd5f24..243d7f119b 100644 --- a/libs/gralloc/types/Android.bp +++ b/libs/gralloc/types/Android.bp @@ -21,6 +21,11 @@ cc_library { "-Wno-enum-compare", ], host_supported: true, + target: { + darwin: { + enabled: false, + } + }, vendor_available: true, vndk: { diff --git a/libs/gralloc/types/fuzzer/Android.bp b/libs/gralloc/types/fuzzer/Android.bp index 84448839a1..8933dc323f 100644 --- a/libs/gralloc/types/fuzzer/Android.bp +++ b/libs/gralloc/types/fuzzer/Android.bp @@ -2,6 +2,11 @@ cc_fuzz { name: "libgralloctypes_fuzzer", defaults: ["libbinder_ndk_host_user"], host_supported: true, + target: { + darwin: { + enabled: false, + } + }, fuzz_config: { cc: ["marissaw@google.com"], |