Merge "libandroid_runtime,libhwui: use libnativehelper_lazy" (0248d32d) · Commits · e / os / android_frameworks_base

core/jni/Android.bp

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -67,11 +67,12 @@ cc_library_shared {
	"libhwui",		"libhwui",
	"liblog",		"liblog",
	"libminikin",		"libminikin",
	"libnativehelper",
	"libz",		"libz",
	"libziparchive",		"libziparchive",
	],		],

			static_libs: ["libnativehelper_lazy"],

	export_include_dirs: [		export_include_dirs: [
	".",		".",
	"include",		"include",
	@@ -284,12 +285,13 @@ cc_library_shared {
	"libstatspull",		"libstatspull",
	],		],
	export_shared_lib_headers: [		export_shared_lib_headers: [
	// AndroidRuntime.h depends on nativehelper/jni.h
	"libnativehelper",

	// our headers include libnativewindow's public headers		// our headers include libnativewindow's public headers
	"libnativewindow",		"libnativewindow",
	],		],
			export_static_lib_headers: [
			// AndroidRuntime.h depends on nativehelper/jni.h
			"libnativehelper_lazy",
			],
	header_libs: [		header_libs: [
	"bionic_libc_platform_headers",		"bionic_libc_platform_headers",
	"dnsproxyd_protocol_headers",		"dnsproxyd_protocol_headers",

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -343,12 +343,13 @@ cc_defaults {
	"libharfbuzz_ng",		"libharfbuzz_ng",
	"liblog",		"liblog",
	"libminikin",		"libminikin",
	"libnativehelper",
	"libz",		"libz",
	"libziparchive",		"libziparchive",
	"libjpeg",		"libjpeg",
	],		],

			static_libs: ["libnativehelper_lazy"],

	target: {		target: {
	android: {		android: {
	srcs: [ // sources that depend on android only libraries		srcs: [ // sources that depend on android only libraries