Merge "Prepare for libnative{bridge,loader} moving to art/" (2a46301b) · Commits · e / os / android_system_core

libnativebridge/Android.bp

+4 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,8 @@ cc_library_headers {
		cc_library {
		name: "libnativebridge",
		defaults: ["libnativebridge-defaults"],
		// TODO(oth): remove after moving under art/ (b/137364733)
		visibility: ["//visibility:public"],

		host_supported: true,
		srcs: ["native_bridge.cc"],
		@@ -52,6 +54,8 @@ cc_library {
		cc_library {
		name: "libnativebridge_lazy",
		defaults: ["libnativebridge-defaults"],
		// TODO(oth): remove after moving under art/ (b/137364733)
		visibility: ["//visibility:public"],

		host_supported: false,
		srcs: ["native_bridge_lazy.cc"],

+10 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@ cc_defaults {
		cc_library {
		name: "libnativeloader",
		defaults: ["libnativeloader-defaults"],
		// TODO(oth): remove after moving under art/ (b/137364733)
		visibility: ["//visibility:public"],
		host_supported: true,
		srcs: [
		"native_loader.cpp",
		@@ -52,6 +54,8 @@ cc_library {
		cc_library {
		name: "libnativeloader_lazy",
		defaults: ["libnativeloader-defaults"],
		// TODO(oth): remove after moving under art/ (b/137364733)
		visibility: ["//visibility:public"],
		host_supported: false,
		srcs: ["native_loader_lazy.cpp"],
		required: ["libnativeloader"],
		@@ -59,6 +63,8 @@ cc_library {

		cc_library_headers {
		name: "libnativeloader-headers",
		// TODO(oth): remove after moving under art/ (b/137364733)
		visibility: ["//visibility:public"],
		host_supported: true,
		export_include_dirs: ["include"],
		}
		@@ -83,6 +89,9 @@ cc_test {
		"libnativebridge-headers",
		"libnativeloader-headers",
		],
		system_shared_libs: ["libc", "libm"],
		system_shared_libs: [
		"libc",
		"libm",
		],
		test_suites: ["device-tests"],
		}