Merge "Reland "libbinder_ndk: host available"" am: 2ea8cdc9b4 am: 6143e7f0e0 (dad1dc14) · Commits · e / os / platform_frameworks_native

libs/android_runtime_lazy/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ cc_library {
		name: "libandroid_runtime_lazy",
		vendor_available: true,
		double_loadable: true,
		host_supported: true,

		cflags: [
		"-Wall",

+25 −2

Original line number	Diff line number	Diff line
		@@ -14,9 +14,25 @@
		* limitations under the License.
		*/

		// TODO(b/31559095): bionic on host should define this
		cc_defaults {
		name: "libbinder_ndk_host_user",
		target: {
		host: {
		cflags: [
		"-D__INTRODUCED_IN(n)=",
		"-D__assert(a,b,c)=",
		],
		},
		},
		}

		cc_library_shared {
		name: "libbinder_ndk",

		defaults: ["libbinder_ndk_host_user"],
		host_supported: true,

		export_include_dirs: [
		"include_ndk",
		"include_platform",
		@@ -52,10 +68,17 @@ cc_library_shared {
		"jni_headers",
		],

		target: {
		linux: {
		version_script: "libbinder_ndk.map.txt",
		},
		},
		stubs: {
		symbol_file: "libbinder_ndk.map.txt",
		versions: ["29", "30"],
		versions: [
		"29",
		"30",
		],
		},
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@

		#pragma once

		#include <stddef.h>
		#include <sys/cdefs.h>

		#include <android/binder_status.h>