diff --git a/automotive/evs/aidl/Android.bp b/automotive/evs/aidl/Android.bp index 5b2f82f89d..75eb924899 100644 --- a/automotive/evs/aidl/Android.bp +++ b/automotive/evs/aidl/Android.bp @@ -28,9 +28,11 @@ aidl_interface { "android/hardware/automotive/evs/*.aidl", ], stability: "vintf", + defaults: [ + "android.hardware.graphics.common-latest", + ], imports: [ "android.hardware.common-V2", - "android.hardware.graphics.common-V5", ], backend: { java: { diff --git a/camera/device/aidl/Android.bp b/camera/device/aidl/Android.bp index 125f14c41c..48ae34e74a 100644 --- a/camera/device/aidl/Android.bp +++ b/camera/device/aidl/Android.bp @@ -15,12 +15,14 @@ aidl_interface { srcs: ["android/hardware/camera/device/*.aidl"], frozen: true, stability: "vintf", + defaults: [ + "android.hardware.graphics.common-latest", + ], imports: [ "android.hardware.common-V2", "android.hardware.common.fmq-V1", "android.hardware.camera.common-V1", "android.hardware.camera.metadata-V3", - "android.hardware.graphics.common-V5", ], backend: { cpp: { diff --git a/graphics/Android.bp b/graphics/Android.bp index 9e604a1686..d768ecf2b4 100644 --- a/graphics/Android.bp +++ b/graphics/Android.bp @@ -16,6 +16,23 @@ package { 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 @@ cc_defaults { ], } +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 @@ cc_defaults { }, } +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 7bb6b504bf..30b341cd8a 100644 --- a/graphics/allocator/aidl/Android.bp +++ b/graphics/allocator/aidl/Android.bp @@ -13,9 +13,11 @@ aidl_interface { 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 1728f78cbb..bba41daf38 100644 --- a/graphics/composer/aidl/Android.bp +++ b/graphics/composer/aidl/Android.bp @@ -34,8 +34,10 @@ aidl_interface { "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", ], diff --git a/neuralnetworks/aidl/Android.bp b/neuralnetworks/aidl/Android.bp index 145604cbd3..d430933bd1 100644 --- a/neuralnetworks/aidl/Android.bp +++ b/neuralnetworks/aidl/Android.bp @@ -15,9 +15,11 @@ aidl_interface { "android/hardware/neuralnetworks/*.aidl", ], stability: "vintf", + defaults: [ + "android.hardware.graphics.common-latest", + ], imports: [ "android.hardware.common-V2", - "android.hardware.graphics.common-V5", ], backend: { java: {