Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "graphics.common V3 -> V4" am: 06c4f5fda8

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2292293

Change-Id: Ib1037e710727f142e140d033a8da63c3eec941f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Steven Moreland
2022-12-09 17:38:11 +00:00
committed by Automerger Merge Worker
parent 292a625ec0 06c4f5fda8
commit 75e17d6783
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/hwui/Android.bp
View File

@@ -93,6 +93,9 @@ cc_defaults {
cc_defaults {
name: "hwui_static_deps",
defaults: [
"android.hardware.graphics.common-ndk_shared",
],
shared_libs: [
"libbase",
"libharfbuzz_ng",
@@ -106,7 +109,6 @@ 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",

2
services/core/jni/Android.bp
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",

3
services/tests/mockingservicestests/jni/Android.bp
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",
],