Merge "Use android.hardware.graphics.common-ndk and composer3-ndk wrappers." into tm-qpr-dev-plus-aosp

This commit is contained in:
Steven Moreland
2022-12-08 18:53:31 +00:00
committed by Android (Google) Code Review
3 changed files with 7 additions and 4 deletions

View File

@@ -93,6 +93,10 @@ cc_defaults {
cc_defaults {
name: "hwui_static_deps",
defaults: [
"android.hardware.graphics.common-ndk_shared",
"android.hardware.graphics.composer3-ndk_shared",
],
shared_libs: [
"libbase",
"libharfbuzz_ng",
@@ -106,9 +110,7 @@ cc_defaults {
target: {
android: {
shared_libs: [
"android.hardware.graphics.common-V3-ndk",
"android.hardware.graphics.common@1.2",
"android.hardware.graphics.composer3-V1-ndk",
"liblog",
"libcutils",
"libutils",

View File

@@ -89,6 +89,7 @@ cc_library_static {
cc_defaults {
name: "libservices.core-libs",
defaults: ["android.hardware.graphics.common-ndk_shared"],
shared_libs: [
"libadb_pairing_server",
"libadb_pairing_connection",
@@ -159,7 +160,6 @@ cc_defaults {
"android.hardware.graphics.bufferqueue@1.0",
"android.hardware.graphics.bufferqueue@2.0",
"android.hardware.graphics.common@1.2",
"android.hardware.graphics.common-V3-ndk",
"android.hardware.graphics.mapper@4.0",
"android.hardware.input.processor-V1-ndk",
"android.hardware.ir@1.0",

View File

@@ -10,6 +10,8 @@ package {
cc_library_shared {
name: "libmockingservicestestjni",
defaults: ["android.hardware.graphics.common-ndk_shared"],
cflags: [
"-Wall",
"-Werror",
@@ -48,7 +50,6 @@ cc_library_shared {
"android.hardware.graphics.bufferqueue@1.0",
"android.hardware.graphics.bufferqueue@2.0",
"android.hardware.graphics.common@1.2",
"android.hardware.graphics.common-V3-ndk",
"android.hardware.graphics.mapper@4.0",
"android.hidl.token@1.0-utils",
],