Merge "Use static dependencies for libandroid_runtime on host" into main (ea6fd957) · Commits · e / os / android_frameworks_base

core/jni/Android.bp

+31 −19

Original line number	Original line	Diff line number	Diff line
	@@ -105,18 +105,7 @@ cc_library_shared_for_libandroid_runtime {
	],		],

	shared_libs: [		shared_libs: [
	"libbase",
	"libcutils",
	"libtracing_perfetto",		"libtracing_perfetto",
	"libharfbuzz_ng",
	"liblog",
	"libmediautils",
	"libminikin",
	"libz",
	"server_configurable_flags",
	"libaconfig_storage_read_api_cc",
	"android.database.sqlite-aconfig-cc",
	"android.media.audiopolicy-aconfig-cc",
	],		],

	static_libs: [		static_libs: [
	@@ -303,6 +292,14 @@ cc_library_shared_for_libandroid_runtime {
	],		],

	shared_libs: [		shared_libs: [
			"libbase",
			"libharfbuzz_ng",
			"liblog",
			"libmediautils",
			"libminikin",
			"libz",
			"android.database.sqlite-aconfig-cc",
			"android.media.audiopolicy-aconfig-cc",
	"audioclient-types-aidl-cpp",		"audioclient-types-aidl-cpp",
	"audioflinger-aidl-cpp",		"audioflinger-aidl-cpp",
	"audiopolicy-types-aidl-cpp",		"audiopolicy-types-aidl-cpp",
	@@ -412,20 +409,24 @@ cc_library_shared_for_libandroid_runtime {
	"frameworks/native/libs/nativebase/include",		"frameworks/native/libs/nativebase/include",
	"frameworks/native/libs/nativewindow/include",		"frameworks/native/libs/nativewindow/include",
	],		],
	shared_libs: [
	"libicui18n",
	"libicuuc",
	],
	static_libs: [		static_libs: [
	"libandroidfw",		"libandroidfw",
			"libbase",
	"libbinary_parse",		"libbinary_parse",
			"libcutils",
	"libdng_sdk",		"libdng_sdk",
	"libft2",		"libft2",
			"libharfbuzz_ng",
	"libhostgraphics",		"libhostgraphics",
	"libhwui",		"libhwui",
			"libicui18n",
			"libicuuc",
			"libicuuc_stubdata",
	"libimage_type_recognition",		"libimage_type_recognition",
	"libinput",		"libinput",
	"libjpeg",		"libjpeg",
			"liblog",
			"libminikin",
	"libnativehelper_jvm",		"libnativehelper_jvm",
	"libpiex",		"libpiex",
	"libpng",		"libpng",
	@@ -435,11 +436,18 @@ cc_library_shared_for_libandroid_runtime {
	"libwebp-decode",		"libwebp-decode",
	"libwebp-encode",		"libwebp-encode",
	"libwuffs_mirror_release_c",		"libwuffs_mirror_release_c",
			"libz",
	"libimage_io",		"libimage_io",
	"libjpegdecoder",		"libjpegdecoder",
	"libjpegencoder",		"libjpegencoder",
	"libultrahdr",		"libultrahdr",
			"server_configurable_flags",
			],
			export_static_lib_headers: [
			"libnativehelper_jvm",
			"libui-types",
	],		],
			stl: "libc++_static",
	},		},
	host_linux: {		host_linux: {
	srcs: [		srcs: [
	@@ -465,14 +473,18 @@ cc_library_shared_for_libandroid_runtime {
	"libbinderthreadstateutils",		"libbinderthreadstateutils",
	"libsqlite",		"libsqlite",
	"libgui_window_info_static",		"libgui_window_info_static",
	],
	shared_libs: [
	// libbinder needs to be shared since it has global state
	// (e.g. gDefaultServiceManager)
	"libbinder",		"libbinder",
	"libhidlbase", // libhwbinder is in here		"libhidlbase", // libhwbinder is in here
	],		],
	},		},
			linux_glibc_x86_64: {
			ldflags: ["-static-libgcc"],
			dist: {
			targets: ["layoutlib"],
			dir: "layoutlib_native/linux",
			tag: "stripped_all",
			},
			},
	},		},
	}		}