Merge "Introduce libutils_binder_sdk" into main (6635431d) · Commits · e / os / android_system_core

libutils/Android.bp

+13 −5

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ cc_library_headers {
		}

		cc_defaults {
		name: "libutils_defaults",
		name: "libutils_defaults_nodeps",
		vendor_available: true,
		product_available: true,
		recovery_available: true,
		@@ -69,10 +69,6 @@ cc_defaults {
		"-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
		],

		shared_libs: [
		"libcutils",
		"liblog",
		],
		sanitize: {
		misc_undefined: ["integer"],
		},
		@@ -117,6 +113,18 @@ cc_defaults {
		},
		}

		cc_defaults {
		name: "libutils_defaults",
		defaults: [
		"libutils_defaults_nodeps",
		],

		shared_libs: [
		"libcutils",
		"liblog",
		],
		}

		cc_defaults {
		name: "libutils_impl_defaults",
		defaults: [

+24 −2

Original line number	Diff line number	Diff line
		@@ -3,9 +3,9 @@ package {
		}

		cc_defaults {
		name: "libutils_binder_impl_defaults",
		name: "libutils_binder_impl_defaults_nodeps",
		defaults: [
		"libutils_defaults",
		"libutils_defaults_nodeps",
		"apex-lowest-min-sdk-version",
		],
		native_bridge_supported: true,
		@@ -30,11 +30,33 @@ cc_defaults {
		afdo: true,
		}

		cc_defaults {
		name: "libutils_binder_impl_defaults",
		defaults: [
		"libutils_defaults",
		"libutils_binder_impl_defaults_nodeps",
		],
		}

		cc_library {
		name: "libutils_binder",
		defaults: ["libutils_binder_impl_defaults"],
		}

		cc_library_shared {
		name: "libutils_binder_sdk",
		defaults: ["libutils_binder_impl_defaults_nodeps"],

		header_libs: [
		"liblog_stub",
		],

		cflags: [
		"-DANDROID_LOG_STUB_WEAK_PRINT",
		"-DANDROID_UTILS_CALLSTACK_ENABLED=0",
		],
		}

		cc_library {
		name: "libutils_binder_test_compile",
		defaults: ["libutils_binder_impl_defaults"],