commit 0435c6b4f3cdff32a5ea94e44cc1c80f77dd5554
author Sally Qi <sallyqi@google.com> Tue Aug 30 15:13:10 2022 -0700
committer Sally Qi <sallyqi@google.com> Thu Sep 01 13:28:00 2022 -0700
tree 0e38ae11063915c5dace052eaa24892d14089e73
parent cb8583adad4da15c4bdc1d3b5935f3a3a9a3f12c

Add cc_defaults wrapper for android.hardware.graphics.allocator ndk
package.

- to avoid manually rev up if needed.

Bug: 243429120
Test: builds
Change-Id: I25bfcc203cda61af308c37c3766fa9efe6c6784c

graphics/mapper/4.0/utils/vts/Android.bp

diff --git a/graphics/mapper/4.0/utils/vts/Android.bp b/graphics/mapper/4.0/utils/vts/Android.bp
index fd538ae..55e721e 100644
--- a/graphics/mapper/4.0/utils/vts/Android.bp
+++ b/graphics/mapper/4.0/utils/vts/Android.bp
@@ -27,6 +27,7 @@
     name: "android.hardware.graphics.mapper@4.0-vts",
     defaults: [
         "VtsHalTargetTestDefaults",
+        "android.hardware.graphics.allocator-ndk_static",
         "android.hardware.graphics.common-ndk_static",
     ],
     srcs: ["MapperVts.cpp"],
@@ -35,7 +36,6 @@
         "-g",
     ],
     static_libs: [
-        "android.hardware.graphics.allocator-V1-ndk",
         "android.hardware.graphics.allocator@4.0",
         "android.hardware.graphics.mapper@4.0",
         "libaidlcommonsupport",
@@ -46,7 +46,6 @@
         "libvndksupport",
     ],
     export_static_lib_headers: [
-        "android.hardware.graphics.allocator-V1-ndk",
         "android.hardware.graphics.allocator@4.0",
         "android.hardware.graphics.common-V3-ndk",
         "android.hardware.graphics.mapper@4.0",

graphics/mapper/4.0/vts/functional/Android.bp

diff --git a/graphics/mapper/4.0/vts/functional/Android.bp b/graphics/mapper/4.0/vts/functional/Android.bp
index 625a479..6208ae9 100644
--- a/graphics/mapper/4.0/vts/functional/Android.bp
+++ b/graphics/mapper/4.0/vts/functional/Android.bp
@@ -27,6 +27,7 @@
     name: "VtsHalGraphicsMapperV4_0TargetTest",
     defaults: [
         "VtsHalTargetTestDefaults",
+        "android.hardware.graphics.allocator-ndk_shared",
         "android.hardware.graphics.common-ndk_static",
         "use_libaidlvintf_gtest_helper_static",
     ],
@@ -38,7 +39,6 @@
         "libsync",
     ],
     shared_libs: [
-        "android.hardware.graphics.allocator-V1-ndk",
         "android.hardware.graphics.allocator@4.0",
         "android.hardware.graphics.common@1.0",
         "android.hardware.graphics.common@1.1",