diff options
| author | Kiyoung Kim <kiyoungkim@google.com> | 2024-04-09 02:13:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-09 02:13:37 +0000 |
| commit | f78d7657247637157e7b66c74abb6ec366783380 (patch) | |
| tree | 1a86a95b93339e105ffce68fccb4215e8cb9f42a | |
| parent | 40cb40c134257878569a3b9908c631f9ddbc4155 (diff) | |
| parent | 3c7a87b10c897c0e99a2180631b8aafb0fdd5c2a (diff) | |
| download | libhidl-f78d7657247637157e7b66c74abb6ec366783380.tar.gz | |
Merge "Remove VNDK definition(s)" into main
| -rw-r--r-- | Android.bp | 5 | ||||
| -rw-r--r-- | libhidlmemory/Android.bp | 5 | ||||
| -rw-r--r-- | transport/allocator/1.0/utils/Android.bp | 3 | ||||
| -rw-r--r-- | transport/memory/1.0/Android.bp | 4 | ||||
| -rw-r--r-- | transport/memory/token/1.0/Android.bp | 4 | ||||
| -rw-r--r-- | transport/safe_union/1.0/Android.bp | 4 | ||||
| -rw-r--r-- | transport/token/1.0/Android.bp | 3 | ||||
| -rw-r--r-- | transport/token/1.0/utils/Android.bp | 3 |
8 files changed, 2 insertions, 29 deletions
@@ -104,10 +104,7 @@ cc_library { "com.android.nfcservices", "com.android.tethering", ], - vndk: { - enabled: true, - support_system_process: true, - }, + double_loadable: true, whole_static_libs: [ "libhwbinder-impl-internal", ], diff --git a/libhidlmemory/Android.bp b/libhidlmemory/Android.bp index fc5770c..063cd8e 100644 --- a/libhidlmemory/Android.bp +++ b/libhidlmemory/Android.bp @@ -34,10 +34,7 @@ cc_library { enabled: false, }, }, - vndk: { - enabled: true, - support_system_process: true, - }, + double_loadable: true, apex_available: [ "//apex_available:platform", "com.android.neuralnetworks", diff --git a/transport/allocator/1.0/utils/Android.bp b/transport/allocator/1.0/utils/Android.bp index f21047d..7ac7c01 100644 --- a/transport/allocator/1.0/utils/Android.bp +++ b/transport/allocator/1.0/utils/Android.bp @@ -24,9 +24,6 @@ package { cc_library { name: "libhidlallocatorutils", vendor_available: true, - vndk: { - enabled: true, - }, double_loadable: true, defaults: ["libhidl-defaults"], shared_libs: [ diff --git a/transport/memory/1.0/Android.bp b/transport/memory/1.0/Android.bp index 8e066a9..e1b03b2 100644 --- a/transport/memory/1.0/Android.bp +++ b/transport/memory/1.0/Android.bp @@ -14,10 +14,6 @@ hidl_interface { root: "android.hidl", // TODO(b/153609531): remove when no longer needed. native_bridge_supported: true, - vndk: { - enabled: true, - support_system_process: true, - }, srcs: [ "IMapper.hal", "IMemory.hal", diff --git a/transport/memory/token/1.0/Android.bp b/transport/memory/token/1.0/Android.bp index c304284..c7a099e 100644 --- a/transport/memory/token/1.0/Android.bp +++ b/transport/memory/token/1.0/Android.bp @@ -14,10 +14,6 @@ hidl_interface { root: "android.hidl", // TODO(b/153609531): remove when no longer needed. native_bridge_supported: true, - vndk: { - enabled: true, - support_system_process: true, - }, srcs: [ "IMemoryToken.hal", ], diff --git a/transport/safe_union/1.0/Android.bp b/transport/safe_union/1.0/Android.bp index cae92dd..45c010f 100644 --- a/transport/safe_union/1.0/Android.bp +++ b/transport/safe_union/1.0/Android.bp @@ -12,10 +12,6 @@ package { hidl_interface { name: "android.hidl.safe_union@1.0", root: "android.hidl", - vndk: { - enabled: true, - support_system_process: true, - }, srcs: [ "types.hal", ], diff --git a/transport/token/1.0/Android.bp b/transport/token/1.0/Android.bp index 8bda482..88fd909 100644 --- a/transport/token/1.0/Android.bp +++ b/transport/token/1.0/Android.bp @@ -12,9 +12,6 @@ package { hidl_interface { name: "android.hidl.token@1.0", root: "android.hidl", - vndk: { - enabled: true, - }, srcs: [ "ITokenManager.hal", ], diff --git a/transport/token/1.0/utils/Android.bp b/transport/token/1.0/utils/Android.bp index 84f6f0f..a58d730 100644 --- a/transport/token/1.0/utils/Android.bp +++ b/transport/token/1.0/utils/Android.bp @@ -32,9 +32,6 @@ cc_library { enabled: false, }, }, - vndk: { - enabled: true, - }, double_loadable: true, srcs: [ |