Merge "libandroid_runtime,libhwui: use libnativehelper_lazy" into sc-dev (588fb1c7) · Commits · e / os / android_frameworks_base

core/jni/Android.bp

+6 −4

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

		static_libs: ["libnativehelper_lazy"],

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

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

+2 −1

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

		static_libs: ["libnativehelper_lazy"],

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