Snap for 6680390 from fd83b6b8cb5d6fb39220944c97e92323a20e28ca to rvc-releaseandroid-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-platform-11.0.0_r2android-platform-11.0.0_r1android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android-cts-11.0_r1android-11.0.0_r6android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-release

Change-Id: I9bbb71b80cc427c5af7e4276231873b35a4c5767

7 files changed, 14 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 5635bd6..e0ca9e2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -65,6 +65,8 @@ cc_library {
     name: "libhidlbase",
     defaults: ["libhidlbase-combined-impl"],
     host_supported: true,
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
     recovery_available: true,
     vendor_available: true,
     apex_available: [
diff --git a/adapter/Android.bp b/adapter/Android.bp
index ae801bc..07faa10 100644
--- a/adapter/Android.bp
+++ b/adapter/Android.bp
@@ -16,6 +16,8 @@ cc_library {
     name: "libhidladapter",
     defaults: ["libhidl-defaults"],
     vendor_available: true,
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
     srcs: [
         "HidlBinderAdapter.cpp"
     ],
diff --git a/libhidlmemory/Android.bp b/libhidlmemory/Android.bp
index bafb3ef..41da614 100644
--- a/libhidlmemory/Android.bp
+++ b/libhidlmemory/Android.bp
@@ -15,6 +15,8 @@
 cc_library {
     name: "libhidlmemory",
     vendor_available: true,
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
     vndk: {
         enabled: true,
         support_system_process: true,
diff --git a/transport/allocator/1.0/Android.bp b/transport/allocator/1.0/Android.bp
index 80364a7..6da3793 100644
--- a/transport/allocator/1.0/Android.bp
+++ b/transport/allocator/1.0/Android.bp
@@ -3,6 +3,8 @@
 hidl_interface {
     name: "android.hidl.allocator@1.0",
     root: "android.hidl",
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
     vndk: {
         enabled: true,
     },
diff --git a/transport/base/1.0/Android.bp b/transport/base/1.0/Android.bp
index f90831e..8c796b2 100644
--- a/transport/base/1.0/Android.bp
+++ b/transport/base/1.0/Android.bp
@@ -3,6 +3,8 @@
 hidl_interface {
     name: "android.hidl.base@1.0",
     root: "android.hidl",
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
     vndk: {
         enabled: true,
     },
diff --git a/transport/memory/1.0/Android.bp b/transport/memory/1.0/Android.bp
index dd76889..9ce04ed 100644
--- a/transport/memory/1.0/Android.bp
+++ b/transport/memory/1.0/Android.bp
@@ -3,6 +3,8 @@
 hidl_interface {
     name: "android.hidl.memory@1.0",
     root: "android.hidl",
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
     vndk: {
         enabled: true,
         support_system_process: true,
diff --git a/transport/memory/token/1.0/Android.bp b/transport/memory/token/1.0/Android.bp
index 937e086..46c3387 100644
--- a/transport/memory/token/1.0/Android.bp
+++ b/transport/memory/token/1.0/Android.bp
@@ -3,6 +3,8 @@
 hidl_interface {
     name: "android.hidl.memory.token@1.0",
     root: "android.hidl",
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
     vndk: {
         enabled: true,
         support_system_process: true,