Graphics: Add Rust and AIDL defaults for graphics HALS, migrate usages
- Add new defaults for Rust and AIDL graphics HAL library references
- Migrate HAL interfaces to use new AIDL defaults
This is in preparation for upgrading the graphics.common HAL to V6.
Test: Builds
Bug: 368395888
Flag: EXEMPT build changes
Change-Id: I9d312328255226fbd7162b9dfd151dfa823f1858
diff --git a/graphics/Android.bp b/graphics/Android.bp
index 9e604a1..d768ecf 100644
--- a/graphics/Android.bp
+++ b/graphics/Android.bp
@@ -16,6 +16,23 @@
default_applicable_licenses: ["hardware_interfaces_license"],
}
+aidl_interface_defaults {
+ name: "android.hardware.graphics.allocator-latest",
+ imports: [
+ "android.hardware.graphics.allocator-V2",
+ ],
+}
+
+rust_defaults {
+ name: "android.hardware.graphics.allocator-latest-rust",
+ rustlibs: [
+ "android.hardware.graphics.allocator-V2-rust",
+ ],
+ defaults: [
+ "android.hardware.graphics.common-latest-rust",
+ ],
+}
+
cc_defaults {
name: "android.hardware.graphics.allocator-ndk_static",
target: {
@@ -44,6 +61,20 @@
],
}
+aidl_interface_defaults {
+ name: "android.hardware.graphics.common-latest",
+ imports: [
+ "android.hardware.graphics.common-V5",
+ ],
+}
+
+rust_defaults {
+ name: "android.hardware.graphics.common-latest-rust",
+ rustlibs: [
+ "android.hardware.graphics.common-V5-rust",
+ ],
+}
+
cc_defaults {
name: "android.hardware.graphics.common-ndk_static",
target: {
@@ -66,6 +97,13 @@
},
}
+aidl_interface_defaults {
+ name: "android.hardware.graphics.composer3-latest",
+ imports: [
+ "android.hardware.graphics.composer3-V4",
+ ],
+}
+
cc_defaults {
name: "android.hardware.graphics.composer3-ndk_static",
target: {
diff --git a/graphics/allocator/aidl/Android.bp b/graphics/allocator/aidl/Android.bp
index 7bb6b50..30b341c 100644
--- a/graphics/allocator/aidl/Android.bp
+++ b/graphics/allocator/aidl/Android.bp
@@ -13,9 +13,11 @@
vendor_available: true,
double_loadable: true,
srcs: ["android/hardware/graphics/allocator/*.aidl"],
+ defaults: [
+ "android.hardware.graphics.common-latest",
+ ],
imports: [
"android.hardware.common-V2",
- "android.hardware.graphics.common-V5",
],
stability: "vintf",
backend: {
diff --git a/graphics/composer/aidl/Android.bp b/graphics/composer/aidl/Android.bp
index 1728f78..bba41da 100644
--- a/graphics/composer/aidl/Android.bp
+++ b/graphics/composer/aidl/Android.bp
@@ -34,8 +34,10 @@
"android/hardware/graphics/composer3/*.aidl",
],
stability: "vintf",
+ defaults: [
+ "android.hardware.graphics.common-latest",
+ ],
imports: [
- "android.hardware.graphics.common-V5",
"android.hardware.common-V2",
"android.hardware.drm.common-V1",
],