Merge "Remove TREBLE_TESTING_OVERRIDE."
diff --git a/Android.bp b/Android.bp
index 731d87b..bc4e532 100644
--- a/Android.bp
+++ b/Android.bp
@@ -65,6 +65,8 @@
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: [
@@ -108,8 +110,8 @@
}
// WARNING: deprecated
-// This library is no longer required, and dependencies should be taken
-// on libhidlbase instead.
+// This library is no longer required, and dependencies should be taken on libhidlbase instead.
+// This is automatically removed by bpfix. Once there are no makefiles, fixes can be automatically applied, and this can be removed.
cc_library {
name: "libhidltransport",
vendor_available: true,
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 @@
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 5828e9a..d3bef74 100644
--- a/libhidlmemory/Android.bp
+++ b/libhidlmemory/Android.bp
@@ -17,6 +17,8 @@
vendor_available: true,
// Host support is needed for testing only
host_supported: true,
+ // TODO(b/153609531): remove when no longer needed.
+ native_bridge_supported: true,
target: {
darwin: {
enabled: false,
diff --git a/transport/allocator/1.0/Android.bp b/transport/allocator/1.0/Android.bp
index 0cac94a..4196216 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,
srcs: [
"IAllocator.hal",
],
diff --git a/transport/base/1.0/Android.bp b/transport/base/1.0/Android.bp
index 1cea887..2ce883b 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,
srcs: [
"types.hal",
"IBase.hal",
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,
