diff options
| author | Steven Moreland <smoreland@google.com> | 2022-02-04 18:34:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-02-04 18:34:09 +0000 |
| commit | 415611420c90688c27da9eaf1e57b592be82d754 (patch) | |
| tree | cb0834573977c550833daa628c60d0a1b5ec90f2 | |
| parent | 8678720c9942bea322727716bd59879496705f87 (diff) | |
| parent | ff6fef39230879eb88587ebce42a6373d3af64cc (diff) | |
| download | native-415611420c90688c27da9eaf1e57b592be82d754.tar.gz | |
Merge "remove libbinder_ndk_host_user"
| -rw-r--r-- | libs/binder/ndk/Android.bp | 10 | ||||
| -rw-r--r-- | libs/binder/tests/Android.bp | 1 | ||||
| -rw-r--r-- | libs/gralloc/types/Android.bp | 5 | ||||
| -rw-r--r-- | libs/gralloc/types/fuzzer/Android.bp | 3 |
4 files changed, 3 insertions, 16 deletions
diff --git a/libs/binder/ndk/Android.bp b/libs/binder/ndk/Android.bp index 77493b3882..79c8c8f88b 100644 --- a/libs/binder/ndk/Android.bp +++ b/libs/binder/ndk/Android.bp @@ -32,16 +32,6 @@ license { ], } -// TODO(b/211908498): remove this -cc_defaults { - name: "libbinder_ndk_host_user", - target: { - darwin: { - enabled: false, - }, - }, -} - cc_library { name: "libbinder_ndk", diff --git a/libs/binder/tests/Android.bp b/libs/binder/tests/Android.bp index 2ce00b2255..ff55d6ebdc 100644 --- a/libs/binder/tests/Android.bp +++ b/libs/binder/tests/Android.bp @@ -197,7 +197,6 @@ cc_test { }, defaults: [ "binder_test_defaults", - "libbinder_ndk_host_user", "libbinder_tls_shared_deps", ], diff --git a/libs/gralloc/types/Android.bp b/libs/gralloc/types/Android.bp index cda9e19c1e..9a7bad4911 100644 --- a/libs/gralloc/types/Android.bp +++ b/libs/gralloc/types/Android.bp @@ -23,7 +23,6 @@ package { cc_library { name: "libgralloctypes", - defaults: ["libbinder_ndk_host_user"], cflags: [ "-Wall", "-Werror", @@ -33,7 +32,7 @@ cc_library { target: { darwin: { enabled: false, - } + }, }, vendor_available: true, @@ -48,7 +47,7 @@ cc_library { min_sdk_version: "29", srcs: [ - "Gralloc4.cpp" + "Gralloc4.cpp", ], shared_libs: [ diff --git a/libs/gralloc/types/fuzzer/Android.bp b/libs/gralloc/types/fuzzer/Android.bp index 6689771a24..3c3b6af670 100644 --- a/libs/gralloc/types/fuzzer/Android.bp +++ b/libs/gralloc/types/fuzzer/Android.bp @@ -9,12 +9,11 @@ package { cc_fuzz { name: "libgralloctypes_fuzzer", - defaults: ["libbinder_ndk_host_user"], host_supported: true, target: { darwin: { enabled: false, - } + }, }, fuzz_config: { |