tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
package.

- to avoid manually rev up if needed.

Bug: 243429120
Test: builds
Change-Id: I25bfcc203cda61af308c37c3766fa9efe6c6784c
This commit is contained in:
Sally Qi 2022-08-30 15:13:10 -07:00
parent cb8583adad
commit 0435c6b4f3
13 changed files with 48 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
graphics/Android.bp
View file

@ -16,6 +16,20 @@ package {
default_applicable_licenses: ["hardware_interfaces_license"],
}
cc_defaults {
name: "android.hardware.graphics.allocator-ndk_static",
static_libs: [
"android.hardware.graphics.allocator-V1-ndk",
],
}
cc_defaults {
name: "android.hardware.graphics.allocator-ndk_shared",
shared_libs: [
"android.hardware.graphics.allocator-V1-ndk",
],
}
cc_defaults {
name: "android.hardware.graphics.common-ndk_static",
static_libs: [

2
graphics/allocator/aidl/vts/Android.bp
View file

@ -27,6 +27,7 @@ cc_test {
name: "VtsHalGraphicsAllocatorAidl_TargetTest",
defaults: [
"VtsHalTargetTestDefaults",
"android.hardware.graphics.allocator-ndk_shared",
"use_libaidlvintf_gtest_helper_static",
"hwui_defaults",
],
@ -35,7 +36,6 @@ cc_test {
],
shared_libs: [
"android.hardware.graphics.allocator-V1-ndk",
"android.hardware.graphics.mapper@4.0",
"libEGL",
"libGLESv2",

7
graphics/composer/2.1/utils/vts/Android.bp
View file

@ -25,14 +25,16 @@ package {
cc_library_static {
name: "android.hardware.graphics.composer@2.1-vts",
defaults: ["hidl_defaults"],
defaults: [
"android.hardware.graphics.allocator-ndk_static",
"hidl_defaults",
],
srcs: [
"ComposerVts.cpp",
"GraphicsComposerCallback.cpp",
"TestCommandReader.cpp",
],
static_libs: [
"android.hardware.graphics.allocator-V1-ndk",
"android.hardware.graphics.composer@2.1",
"android.hardware.graphics.mapper@2.0-vts",
"android.hardware.graphics.mapper@3.0-vts",
@ -40,7 +42,6 @@ cc_library_static {
"libgtest",
],
export_static_lib_headers: [
"android.hardware.graphics.allocator-V1-ndk",
"android.hardware.graphics.composer@2.1",
"android.hardware.graphics.mapper@2.0-vts",
"android.hardware.graphics.mapper@3.0-vts",

6
graphics/composer/2.1/vts/functional/Android.bp
View file

@ -25,7 +25,10 @@ package {
cc_test {
name: "VtsHalGraphicsComposerV2_1TargetTest",
defaults: ["VtsHalTargetTestDefaults"],
defaults: [
"VtsHalTargetTestDefaults",
"android.hardware.graphics.allocator-ndk_static",
],
tidy_timeout_srcs: ["VtsHalGraphicsComposerV2_1TargetTest.cpp"],
srcs: ["VtsHalGraphicsComposerV2_1TargetTest.cpp"],
@ -42,7 +45,6 @@ cc_test {
"android.hardware.graphics.mapper@4.0",
],
static_libs: [
"android.hardware.graphics.allocator-V1-ndk",
"android.hardware.graphics.allocator@2.0",
"android.hardware.graphics.allocator@3.0",
"android.hardware.graphics.allocator@4.0",

3
graphics/composer/2.2/utils/vts/Android.bp
View file

@ -26,6 +26,7 @@ package {
cc_library_static {
name: "android.hardware.graphics.composer@2.2-vts",
defaults: [
"android.hardware.graphics.allocator-ndk_static",
"android.hardware.graphics.composer3-ndk_static",
"hidl_defaults",
],
@ -38,7 +39,6 @@ cc_library_static {
"libui",
],
static_libs: [
"android.hardware.graphics.allocator-V1-ndk",
"android.hardware.graphics.composer@2.1-vts",
"android.hardware.graphics.composer@2.2",
"android.hardware.graphics.mapper@2.1-vts",
@ -55,7 +55,6 @@ cc_library_static {
"android.hardware.graphics.mapper@4.0-vts",
],
export_static_lib_headers: [
"android.hardware.graphics.allocator-V1-ndk",
"android.hardware.graphics.composer@2.1-vts",
"android.hardware.graphics.composer@2.2",
"android.hardware.graphics.mapper@2.1-vts",

2
graphics/composer/2.2/vts/functional/Android.bp
View file

@ -27,6 +27,7 @@ cc_test {
name: "VtsHalGraphicsComposerV2_2TargetTest",
defaults: [
"VtsHalTargetTestDefaults",
"android.hardware.graphics.allocator-ndk_static",
"android.hardware.graphics.composer3-ndk_static",
// Needed for librenderengine
"skia_deps",
@ -60,7 +61,6 @@ cc_test {
"android.hardware.graphics.mapper@4.0",
],
static_libs: [
"android.hardware.graphics.allocator-V1-ndk",
"android.hardware.graphics.allocator@2.0",
"android.hardware.graphics.allocator@3.0",
"android.hardware.graphics.allocator@4.0",

5
graphics/composer/2.3/utils/vts/Android.bp
View file

@ -25,7 +25,10 @@ package {
cc_library_static {
name: "android.hardware.graphics.composer@2.3-vts",
defaults: ["hidl_defaults"],
defaults: [
"android.hardware.graphics.allocator-ndk_static",
"hidl_defaults",
],
srcs: [
"ComposerVts.cpp",
],

6
graphics/composer/2.3/vts/functional/Android.bp
View file

@ -25,7 +25,10 @@ package {
cc_test {
name: "VtsHalGraphicsComposerV2_3TargetTest",
defaults: ["VtsHalTargetTestDefaults"],
defaults: [
"VtsHalTargetTestDefaults",
"android.hardware.graphics.allocator-ndk_static",
],
tidy_timeout_srcs: ["VtsHalGraphicsComposerV2_3TargetTest.cpp"],
srcs: ["VtsHalGraphicsComposerV2_3TargetTest.cpp"],
@ -43,7 +46,6 @@ cc_test {
"android.hardware.graphics.mapper@4.0",
],
static_libs: [
"android.hardware.graphics.allocator-V1-ndk",
"android.hardware.graphics.allocator@2.0",
"android.hardware.graphics.allocator@3.0",
"android.hardware.graphics.allocator@4.0",

6
graphics/composer/2.4/utils/vts/Android.bp
View file

@ -25,14 +25,16 @@ package {
cc_library_static {
name: "android.hardware.graphics.composer@2.4-vts",
defaults: ["hidl_defaults"],
defaults: [
"android.hardware.graphics.allocator-ndk_static",
"hidl_defaults",
],
srcs: [
"ComposerVts.cpp",
"GraphicsComposerCallback.cpp",
"TestCommandReader.cpp",
],
static_libs: [
"android.hardware.graphics.allocator-V1-ndk",
"android.hardware.graphics.composer@2.1",
"android.hardware.graphics.composer@2.2",
"android.hardware.graphics.composer@2.3-vts",

6
graphics/composer/2.4/vts/functional/Android.bp
View file

@ -25,7 +25,10 @@ package {
cc_test {
name: "VtsHalGraphicsComposerV2_4TargetTest",
defaults: ["VtsHalTargetTestDefaults"],
defaults: [
"VtsHalTargetTestDefaults",
"android.hardware.graphics.allocator-ndk_static",
],
tidy_timeout_srcs: ["VtsHalGraphicsComposerV2_4TargetTest.cpp"],
srcs: ["VtsHalGraphicsComposerV2_4TargetTest.cpp"],
@ -42,7 +45,6 @@ cc_test {
"android.hardware.graphics.mapper@4.0",
],
static_libs: [
"android.hardware.graphics.allocator-V1-ndk",
"android.hardware.graphics.allocator@2.0",
"android.hardware.graphics.allocator@3.0",
"android.hardware.graphics.allocator@4.0",

3
graphics/mapper/4.0/utils/vts/Android.bp
View file

@ -27,6 +27,7 @@ cc_library_static {
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 @@ cc_library_static {
"-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 @@ cc_library_static {
"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",

2
graphics/mapper/4.0/vts/functional/Android.bp
View file

@ -27,6 +27,7 @@ cc_test {
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 @@ cc_test {
"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",

8
sensors/common/vts/utils/Android.bp
View file

@ -27,9 +27,11 @@ package {
// dependencies
cc_defaults {
name: "VtsHalSensorsDefaults",
defaults: ["android.hardware.graphics.common-ndk_shared"],
defaults: [
"android.hardware.graphics.allocator-ndk_shared",
"android.hardware.graphics.common-ndk_shared",
],
shared_libs: [
"android.hardware.graphics.allocator-V1-ndk",
"libbinder_ndk",
"libutils",
"libvndksupport",
@ -44,6 +46,7 @@ cc_library_static {
name: "VtsHalSensorsTargetTestUtils",
defaults: [
"VtsHalTargetTestDefaults",
"android.hardware.graphics.allocator-ndk_shared",
"android.hardware.graphics.common-ndk_shared",
],
cflags: ["-DLOG_TAG=\"sensors_hidl_hal_test\""],
@ -58,7 +61,6 @@ cc_library_static {
],
// Targets that depend on us need to also include these
shared_libs: [
"android.hardware.graphics.allocator-V1-ndk",
"libbinder_ndk",
"libutils",
"libvndksupport",