diff options
| author | Steven Moreland <smoreland@google.com> | 2022-01-14 23:10:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-01-14 23:10:16 +0000 |
| commit | ee22878ac8fe26f7edf8bd42ff6d8d02aaf0413a (patch) | |
| tree | 0c6717defcb7972c3f272916bea420f191441725 | |
| parent | d89d96d1964206a8051e7141933e78ae95ede345 (diff) | |
| parent | 738d3d5950523bffb2d7ef714f56a4d5f5242a1a (diff) | |
Merge "remove libbinder_ndk_host_user"
| -rw-r--r-- | common/support/Android.bp | 12 | ||||
| -rw-r--r-- | health/aidl/Android.bp | 8 | ||||
| -rw-r--r-- | health/utils/libhealthshim/Android.bp | 8 |
3 files changed, 20 insertions, 8 deletions
diff --git a/common/support/Android.bp b/common/support/Android.bp index b24893b16e..718901ef6a 100644 --- a/common/support/Android.bp +++ b/common/support/Android.bp @@ -11,7 +11,11 @@ cc_library_static { name: "libaidlcommonsupport", vendor_available: true, host_supported: true, - defaults: ["libbinder_ndk_host_user"], + target: { + darwin: { + enabled: false, + }, + }, srcs: ["NativeHandle.cpp"], export_include_dirs: ["include"], shared_libs: [ @@ -28,7 +32,11 @@ cc_library_static { cc_test { name: "libaidlcommonsupport_test", host_supported: true, - defaults: ["libbinder_ndk_host_user"], + target: { + darwin: { + enabled: false, + }, + }, srcs: ["test.cpp"], static_libs: [ "android.hardware.common-V2-ndk", diff --git a/health/aidl/Android.bp b/health/aidl/Android.bp index 22bb4fadc3..86bca69e07 100644 --- a/health/aidl/Android.bp +++ b/health/aidl/Android.bp @@ -62,9 +62,11 @@ cc_library { "android.hardware.health@2.0", "android.hardware.health@2.1", ], - defaults: [ - "libbinder_ndk_host_user", - ], + target: { + darwin: { + enabled: false, + }, + }, } java_library { diff --git a/health/utils/libhealthshim/Android.bp b/health/utils/libhealthshim/Android.bp index 311e951b7f..42e4ea7cc0 100644 --- a/health/utils/libhealthshim/Android.bp +++ b/health/utils/libhealthshim/Android.bp @@ -24,9 +24,11 @@ package { cc_defaults { name: "libhealthshim_defaults", host_supported: true, // for testing - defaults: [ - "libbinder_ndk_host_user", - ], + target: { + darwin: { + enabled: false, + }, + }, cflags: [ "-Wall", "-Werror", |