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

Commit 09dfe2a6 authored Feb 05, 2021 by Jeongik Cha Committed by Android (Google) Code Review Feb 05, 2021

Merge "Specify version for aidl_interface explicitly" into sc-dev

parents b9b8c92f 830c5007

cmds/idlcli/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,7 @@
	cc_defaults {		cc_defaults {
	name: "idlcli-defaults",		name: "idlcli-defaults",
	shared_libs: [		shared_libs: [
	"android.hardware.vibrator-unstable-ndk_platform",		"android.hardware.vibrator-V2-ndk_platform",
	"android.hardware.vibrator@1.0",		"android.hardware.vibrator@1.0",
	"android.hardware.vibrator@1.1",		"android.hardware.vibrator@1.1",
	"android.hardware.vibrator@1.2",		"android.hardware.vibrator@1.2",

libs/gralloc/types/Android.bp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -43,14 +43,14 @@ cc_library {
	],		],

	shared_libs: [		shared_libs: [
	"android.hardware.graphics.common-unstable-ndk_platform",		"android.hardware.graphics.common-V2-ndk_platform",
	"android.hardware.graphics.mapper@4.0",		"android.hardware.graphics.mapper@4.0",
	"libhidlbase",		"libhidlbase",
	"liblog",		"liblog",
	],		],

	export_shared_lib_headers: [		export_shared_lib_headers: [
	"android.hardware.graphics.common-unstable-ndk_platform",		"android.hardware.graphics.common-V2-ndk_platform",
	"android.hardware.graphics.mapper@4.0",		"android.hardware.graphics.mapper@4.0",
	"libhidlbase",		"libhidlbase",
	],		],

libs/ui/Android.bp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -140,7 +140,7 @@ cc_library_shared {
	"android.hardware.graphics.allocator@2.0",		"android.hardware.graphics.allocator@2.0",
	"android.hardware.graphics.allocator@3.0",		"android.hardware.graphics.allocator@3.0",
	"android.hardware.graphics.allocator@4.0",		"android.hardware.graphics.allocator@4.0",
	"android.hardware.graphics.common-unstable-ndk_platform",		"android.hardware.graphics.common-V2-ndk_platform",
	"android.hardware.graphics.common@1.2",		"android.hardware.graphics.common@1.2",
	"android.hardware.graphics.mapper@2.0",		"android.hardware.graphics.mapper@2.0",
	"android.hardware.graphics.mapper@2.1",		"android.hardware.graphics.mapper@2.1",
	@@ -157,7 +157,7 @@ cc_library_shared {

	export_shared_lib_headers: [		export_shared_lib_headers: [
	"android.hardware.graphics.common@1.2",		"android.hardware.graphics.common@1.2",
	"android.hardware.graphics.common-unstable-ndk_platform",		"android.hardware.graphics.common-V2-ndk_platform",
	"android.hardware.graphics.mapper@4.0",		"android.hardware.graphics.mapper@4.0",
	"libgralloctypes",		"libgralloctypes",
	],		],

services/powermanager/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,7 @@ cc_library_shared {
	"libutils",		"libutils",
	"android.hardware.power@1.0",		"android.hardware.power@1.0",
	"android.hardware.power@1.1",		"android.hardware.power@1.1",
	"android.hardware.power-cpp",		"android.hardware.power-V1-cpp",
	],		],

	cflags: [		cflags: [

services/powermanager/benchmarks/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,7 @@ cc_benchmark {
	"libutils",		"libutils",
	"android.hardware.power@1.0",		"android.hardware.power@1.0",
	"android.hardware.power@1.1",		"android.hardware.power@1.1",
	"android.hardware.power-cpp",		"android.hardware.power-V1-cpp",
	],		],
	static_libs: [		static_libs: [
	"libtestUtil",		"libtestUtil",