Merge "libbase: add libbase_headers" into oc-dev (3a5394ed) · Commits · e / os / android_system_core

base/Android.bp

+23 −2

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,25 @@ libbase_cppflags = [
	"-Werror",		"-Werror",
	]		]

			cc_library_headers {
			name: "libbase_headers",
			vendor_available: true,
			host_supported: true,
			export_include_dirs: ["include"],

			header_libs: ["libutils_headers"],
			export_header_lib_headers: ["libutils_headers"],

			target: {
			linux_bionic: {
			enabled: true,
			},
			windows: {
			enabled: true,
			},
			},
			}

	cc_library {		cc_library {
	name: "libbase",		name: "libbase",
	clang: true,		clang: true,
	@@ -33,9 +52,11 @@ cc_library {
	"strings.cpp",		"strings.cpp",
	"test_utils.cpp",		"test_utils.cpp",
	],		],
	local_include_dirs: ["include"],
			header_libs: ["libbase_headers"],
			export_header_lib_headers: ["libbase_headers"],

	cppflags: libbase_cppflags,		cppflags: libbase_cppflags,
	export_include_dirs: ["include"],
	shared_libs: ["liblog"],		shared_libs: ["liblog"],
	target: {		target: {
	android: {		android: {