diff options
author | Dimitry Ivanov <dimitry@google.com> | 2019-05-07 11:30:58 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-05-07 11:30:58 +0000 |
commit | 78e42d81ec89d3cd73ed4e8613947c8bdf8341fc (patch) | |
tree | af755077cc7bf2860c96135dc9a3b72ae4494e8a | |
parent | 0633e569bc44271b68e6980cff51d1c89a7c23ae (diff) | |
parent | 7f048808203bb4e1c01f50793b424364cd669f06 (diff) | |
download | bionic-oreo-mr1-iot-release.tar.gz |
Merge "Enable native_bridge_support"android-o-mr1-iot-release-1.0.12oreo-mr1-iot-release
-rw-r--r-- | libc/Android.bp | 5 | ||||
-rw-r--r-- | libc/async_safe/Android.bp | 2 | ||||
-rw-r--r-- | libc/system_properties/Android.bp | 1 | ||||
-rw-r--r-- | libdl/Android.bp | 5 | ||||
-rw-r--r-- | libm/Android.bp | 3 | ||||
-rw-r--r-- | linker/Android.bp | 2 |
6 files changed, 18 insertions, 0 deletions
diff --git a/libc/Android.bp b/libc/Android.bp index fa1eab6cb..5554f28ca 100644 --- a/libc/Android.bp +++ b/libc/Android.bp @@ -76,6 +76,7 @@ cc_defaults { }, native_coverage: false, recovery_available: true, + native_bridge_supported: true, // lld complains about duplicate symbols in libcrt and libgcc. Suppress the // warning since this is intended right now. @@ -1692,6 +1693,7 @@ cc_library_headers { host_supported: true, vendor_available: true, recovery_available: true, + native_bridge_supported: true, no_libcrt: true, no_libgcc: true, @@ -1824,6 +1826,7 @@ cc_defaults { defaults: ["linux_bionic_supported"], vendor_available: true, recovery_available: true, + native_bridge_supported: true, cflags: [ "-Wno-gcc-compat", @@ -2082,6 +2085,7 @@ ndk_headers { ndk_library { name: "libc", + native_bridge_supported: true, symbol_file: "libc.map.txt", first_version: "9", } @@ -2091,6 +2095,7 @@ llndk_library { symbol_file: "libc.map.txt", export_headers_as_system: true, export_preprocessed_headers: ["include"], + native_bridge_supported: true, export_include_dirs: [ "kernel/android/uapi", "kernel/uapi", diff --git a/libc/async_safe/Android.bp b/libc/async_safe/Android.bp index fbaaad174..c28d53aff 100644 --- a/libc/async_safe/Android.bp +++ b/libc/async_safe/Android.bp @@ -10,6 +10,7 @@ cc_library_static { name: "libasync_safe", vendor_available: true, recovery_available: true, + native_bridge_supported: true, include_dirs: ["bionic/libc"], header_libs: ["libc_headers", "liblog_headers"], @@ -22,6 +23,7 @@ cc_library_static { cc_library_headers { name: "libasync_safe_headers", recovery_available: true, + native_bridge_supported: true, defaults: ["linux_bionic_supported"], export_include_dirs: ["include"], diff --git a/libc/system_properties/Android.bp b/libc/system_properties/Android.bp index 911afb129..8780ddae3 100644 --- a/libc/system_properties/Android.bp +++ b/libc/system_properties/Android.bp @@ -1,6 +1,7 @@ cc_library_static { name: "libsystemproperties", defaults: ["libc_defaults"], + native_bridge_supported: true, srcs: [ "context_node.cpp", "contexts_split.cpp", diff --git a/libdl/Android.bp b/libdl/Android.bp index fbbe7ba29..e36ddc5c5 100644 --- a/libdl/Android.bp +++ b/libdl/Android.bp @@ -5,6 +5,7 @@ cc_library_static { name: "libdl_static", defaults: ["linux_bionic_supported"], recovery_available: true, + native_bridge_supported: true, srcs: [ "libdl.cpp", @@ -32,6 +33,7 @@ cc_library_static { cc_library { name: "libdl", recovery_available: true, + native_bridge_supported: true, static_ndk_lib: true, defaults: ["linux_bionic_supported"], @@ -116,6 +118,7 @@ cc_library { defaults: ["linux_bionic_supported"], recovery_available: true, + native_bridge_supported: true, // NOTE: --exclude-libs=libgcc.a makes sure that any symbols libdl.so pulls from // libgcc.a are made static to libdl.so. This in turn ensures that libraries that @@ -181,12 +184,14 @@ cc_library { ndk_library { name: "libdl", + native_bridge_supported: true, symbol_file: "libdl.map.txt", first_version: "9", } llndk_library { name: "libdl", + native_bridge_supported: true, symbol_file: "libdl.map.txt", } diff --git a/libm/Android.bp b/libm/Android.bp index 8c32810d0..48b9a5f06 100644 --- a/libm/Android.bp +++ b/libm/Android.bp @@ -507,6 +507,7 @@ cc_library { integer_overflow: false, }, stl: "none", + native_bridge_supported: true, stubs: { symbol_file: "libm.map.txt", @@ -516,12 +517,14 @@ cc_library { ndk_library { name: "libm", + native_bridge_supported: true, symbol_file: "libm.map.txt", first_version: "9", } llndk_library { name: "libm", + native_bridge_supported: true, symbol_file: "libm.map.txt", } diff --git a/linker/Android.bp b/linker/Android.bp index e908678fb..23ef5aca9 100644 --- a/linker/Android.bp +++ b/linker/Android.bp @@ -2,6 +2,7 @@ cc_library_static { name: "liblinker_malloc", defaults: ["linux_bionic_supported"], recovery_available: true, + native_bridge_supported: true, srcs: [ "linker_memory.cpp", @@ -361,6 +362,7 @@ cc_library { name: "ld-android", defaults: ["linux_bionic_supported"], recovery_available: true, + native_bridge_supported: true, nocrt: true, system_shared_libs: [], |