Merge "bpfmt native/android/Android.bp" into sc-dev (8af1716c) · Commits · e / os / android_frameworks_base

native/android/Android.bp

+20 −15

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ cc_library_shared {
		"surface_texture.cpp",
		"system_fonts.cpp",
		"trace.cpp",
		"thermal.cpp"
		"thermal.cpp",
		],

		shared_libs: [
		@@ -98,7 +98,10 @@ cc_library_shared {
		"libarect",
		],

		header_libs: [ "libhwui_internal_headers", "libandroid_headers_private"],
		header_libs: [
		"libhwui_internal_headers",
		"libandroid_headers_private",
		],

		whole_static_libs: ["libnativewindow"],

		@@ -106,14 +109,17 @@ cc_library_shared {

		include_dirs: ["bionic/libc/dns/include"],

		local_include_dirs: [ "include_platform", ],
		local_include_dirs: ["include_platform"],

		export_include_dirs: [ "include_platform", ],
		export_include_dirs: ["include_platform"],

		version_script: "libandroid.map.txt",
		stubs: {
		symbol_file: "libandroid.map.txt",
		versions: ["29", "31"],
		versions: [
		"29",
		"31",
		],
		},
		}

		@@ -136,7 +142,6 @@ llndk_library {
		unversioned: true,
		}


		// Aidl library for platform compat.
		cc_library_shared {
		name: "lib-platform-compat-native-api",