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

Commit 0a21415e authored Aug 05, 2017 by TreeHugger Robot Committed by Android (Google) Code Review Aug 05, 2017

Merge changes from topic 'hidl-vndk-enabled-oc-mr1' into oc-mr1-dev

* changes:
  Mark hidl utils as vndk
  Manually update makefile for vndk-sp hidl libs.
  Update make file for vndk enabled.

parents c0d5b9bb eff28dc3

audio/2.0/Android.bp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -88,6 +88,9 @@ cc_library {
	generated_headers: ["android.hardware.audio@2.0_genc++_headers"],		generated_headers: ["android.hardware.audio@2.0_genc++_headers"],
	export_generated_headers: ["android.hardware.audio@2.0_genc++_headers"],		export_generated_headers: ["android.hardware.audio@2.0_genc++_headers"],
	vendor_available: true,		vendor_available: true,
			vndk: {
			enabled: true,
			},
	shared_libs: [		shared_libs: [
	"libhidlbase",		"libhidlbase",
	"libhidltransport",		"libhidltransport",

audio/common/2.0/Android.bp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -39,6 +39,9 @@ cc_library {
	generated_headers: ["android.hardware.audio.common@2.0_genc++_headers"],		generated_headers: ["android.hardware.audio.common@2.0_genc++_headers"],
	export_generated_headers: ["android.hardware.audio.common@2.0_genc++_headers"],		export_generated_headers: ["android.hardware.audio.common@2.0_genc++_headers"],
	vendor_available: true,		vendor_available: true,
			vndk: {
			enabled: true,
			},
	shared_libs: [		shared_libs: [
	"libhidlbase",		"libhidlbase",
	"libhidltransport",		"libhidltransport",

audio/common/2.0/default/Android.bp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,9 @@
	cc_library_shared {		cc_library_shared {
	name: "android.hardware.audio.common@2.0-util",		name: "android.hardware.audio.common@2.0-util",
	vendor_available: true,		vendor_available: true,
			vndk: {
			enabled: true,
			},
	srcs: [		srcs: [
	"EffectMap.cpp",		"EffectMap.cpp",
	"HidlUtils.cpp",		"HidlUtils.cpp",

audio/effect/2.0/Android.bp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -137,6 +137,9 @@ cc_library {
	generated_headers: ["android.hardware.audio.effect@2.0_genc++_headers"],		generated_headers: ["android.hardware.audio.effect@2.0_genc++_headers"],
	export_generated_headers: ["android.hardware.audio.effect@2.0_genc++_headers"],		export_generated_headers: ["android.hardware.audio.effect@2.0_genc++_headers"],
	vendor_available: true,		vendor_available: true,
			vndk: {
			enabled: true,
			},
	shared_libs: [		shared_libs: [
	"libhidlbase",		"libhidlbase",
	"libhidltransport",		"libhidltransport",

automotive/evs/1.0/Android.bp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -67,6 +67,9 @@ cc_library {
	generated_headers: ["android.hardware.automotive.evs@1.0_genc++_headers"],		generated_headers: ["android.hardware.automotive.evs@1.0_genc++_headers"],
	export_generated_headers: ["android.hardware.automotive.evs@1.0_genc++_headers"],		export_generated_headers: ["android.hardware.automotive.evs@1.0_genc++_headers"],
	vendor_available: true,		vendor_available: true,
			vndk: {
			enabled: true,
			},
	shared_libs: [		shared_libs: [
	"libhidlbase",		"libhidlbase",
	"libhidltransport",		"libhidltransport",