Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5b98209 authored Aug 30, 2022 by Sally Qi Committed by Android (Google) Code Review Aug 30, 2022

Merge "Use android.hardware.graphics.common-ndk and composer3-ndk wrappers."

parents cc7f1ece 6920a2fa

libs/gralloc/types/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ package {

		cc_library {
		name: "libgralloctypes",
		defaults: ["android.hardware.graphics.common-ndk_shared"],
		cflags: [
		"-Wall",
		"-Werror",
		@@ -51,7 +52,6 @@ cc_library {
		],

		shared_libs: [
		"android.hardware.graphics.common-V3-ndk",
		"android.hardware.graphics.mapper@4.0",
		"libhidlbase",
		"liblog",

libs/gui/Android.bp

+2 −1

Original line number	Diff line number	Diff line
		@@ -336,6 +336,8 @@ filegroup {
		cc_defaults {
		name: "libgui_bufferqueue-defaults",

		defaults: ["android.hardware.graphics.common-ndk_shared"],

		cflags: [
		"-Wall",
		"-Werror",
		@@ -364,7 +366,6 @@ cc_defaults {
		"android.hardware.graphics.bufferqueue@2.0",
		"android.hardware.graphics.common@1.1",
		"android.hardware.graphics.common@1.2",
		"android.hardware.graphics.common-V3-ndk",
		"android.hidl.token@1.0-utils",
		"libbase",
		"libcutils",

libs/renderengine/Android.bp

+4 −2

Original line number	Diff line number	Diff line
		@@ -21,13 +21,15 @@ cc_defaults {

		cc_defaults {
		name: "librenderengine_defaults",
		defaults: ["renderengine_defaults"],
		defaults: [
		"android.hardware.graphics.composer3-ndk_shared",
		"renderengine_defaults",
		],
		cflags: [
		"-DGL_GLEXT_PROTOTYPES",
		"-DEGL_EGLEXT_PROTOTYPES",
		],
		shared_libs: [
		"android.hardware.graphics.composer3-V1-ndk",
		"libbase",
		"libcutils",
		"libEGL",

libs/renderengine/benchmark/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ package {
		cc_benchmark {
		name: "librenderengine_bench",
		defaults: [
		"android.hardware.graphics.composer3-ndk_shared",
		"skia_deps",
		"surfaceflinger_defaults",
		],
		@@ -43,7 +44,6 @@ cc_benchmark {
		],

		shared_libs: [
		"android.hardware.graphics.composer3-V1-ndk",
		"libbase",
		"libcutils",
		"libjnigraphics",

libs/renderengine/tests/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ package {
		cc_test {
		name: "librenderengine_test",
		defaults: [
		"android.hardware.graphics.composer3-ndk_shared",
		"skia_deps",
		"surfaceflinger_defaults",
		],
		@@ -49,7 +50,6 @@ cc_test {
		],

		shared_libs: [
		"android.hardware.graphics.composer3-V1-ndk",
		"libbase",
		"libcutils",
		"libEGL",