From 454ba7ec880db8e44bb830ea9d12ac682acf68e2 Mon Sep 17 00:00:00 2001 From: dimitry Date: Thu, 16 May 2019 13:48:17 +0200 Subject: [PATCH 1/6] Enable native_bridge_support for libutils Android build system added support for building translated binaries used on natively bridged targets (arm on x86 for example). However in order to avoid building unnecessary binaries and libraries for such architectures most modules do not support native bridge by default. All needed modules have to explicitly indicate if they may be used as part of translated binary build. This change enabled native bridge support for libutils which is a greylisted library (available for apps targeting Android version < N). Bug: http://b/77159578 Test: make Change-Id: I58667558d2a673fc0d882cf623b7a1b6f6f305ec --- libutils/Android.bp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libutils/Android.bp b/libutils/Android.bp index 4f194c702..8be4dd088 100644 --- a/libutils/Android.bp +++ b/libutils/Android.bp @@ -17,6 +17,7 @@ cc_library_headers { vendor_available: true, recovery_available: true, host_supported: true, + native_bridge_supported: true, header_libs: [ "liblog_headers", @@ -121,6 +122,7 @@ cc_defaults { cc_library { name: "libutils", defaults: ["libutils_defaults"], + native_bridge_supported: true, srcs: [ "FileMap.cpp", From 49ab87bba4b6aa3ed11addd64578055b56d3b648 Mon Sep 17 00:00:00 2001 From: dimitry Date: Thu, 16 May 2019 14:07:43 +0200 Subject: [PATCH 2/6] Enable native_bridge_support for libbacktrace_headers Android build system added support for building translated binaries used on natively bridged targets (arm on x86 for example). However in order to avoid building unnecessary binaries and libraries for such architectures most modules do not support native bridge by default. All needed modules have to explicitly indicate if they may be used as part of translated binary build. This change enabled native bridge support for libbacktrace_headers a dependency of libutils greylisted library (available for apps targeting Android version < N). Bug: http://b/77159578 Test: make Change-Id: I531d3d60937c5f7a95daead29dfc5913bd663321 --- libbacktrace/Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/libbacktrace/Android.bp b/libbacktrace/Android.bp index 7f9a18a3d..e171155b9 100644 --- a/libbacktrace/Android.bp +++ b/libbacktrace/Android.bp @@ -42,6 +42,7 @@ cc_library_headers { name: "libbacktrace_headers", vendor_available: true, recovery_available: true, + native_bridge_supported: true, export_include_dirs: ["include"], } From 11ea33776f3f49979731fc466bbeb9baab165816 Mon Sep 17 00:00:00 2001 From: dimitry Date: Thu, 16 May 2019 14:13:38 +0200 Subject: [PATCH 3/6] Enable native_bridge_support for libsystem_headers Android build system added support for building translated binaries used on natively bridged targets (arm on x86 for example). However in order to avoid building unnecessary binaries and libraries for such architectures most modules do not support native bridge by default. All needed modules have to explicitly indicate if they may be used as part of translated binary build. This change enabled native bridge support for libsystem_headers a dependency of libutils greylisted library (available for apps targeting Android version < N). Bug: http://b/77159578 Test: make Change-Id: Ie4004c981075b22d08e4cca8cb35a7df5e157d46 --- libsystem/Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/libsystem/Android.bp b/libsystem/Android.bp index 2e22b435f..b265b61eb 100644 --- a/libsystem/Android.bp +++ b/libsystem/Android.bp @@ -3,6 +3,7 @@ cc_library_headers { vendor_available: true, recovery_available: true, host_supported: true, + native_bridge_supported: true, export_include_dirs: ["include"], target: { From 051d5cba801ada2130159cbe6fa56104e76e1c8b Mon Sep 17 00:00:00 2001 From: dimitry Date: Thu, 16 May 2019 14:17:00 +0200 Subject: [PATCH 4/6] Enable native_bridge_support for libcutils Android build system added support for building translated binaries used on natively bridged targets (arm on x86 for example). However in order to avoid building unnecessary binaries and libraries for such architectures most modules do not support native bridge by default. All needed modules have to explicitly indicate if they may be used as part of translated binary build. This change enabled native bridge support for libcutils which is a greylisted library (available for apps targeting Android version < N). Bug: http://b/77159578 Test: make Change-Id: I56fe5e11a884d22714cfc4afb78bec0a352d6370 --- libcutils/Android.bp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libcutils/Android.bp b/libcutils/Android.bp index 619bc567a..319a73aba 100644 --- a/libcutils/Android.bp +++ b/libcutils/Android.bp @@ -34,6 +34,7 @@ cc_library_headers { vendor_available: true, recovery_available: true, host_supported: true, + native_bridge_supported: true, export_include_dirs: ["include"], target: { vendor: { @@ -57,6 +58,7 @@ cc_library { }, recovery_available: true, host_supported: true, + native_bridge_supported: true, srcs: [ "config_utils.cpp", "canned_fs_config.cpp", From 49c1f6efea5267ec40343a8dc6445b9c594a72ec Mon Sep 17 00:00:00 2001 From: dimitry Date: Thu, 16 May 2019 14:19:09 +0200 Subject: [PATCH 5/6] Enable native_bridge_support for libprocessgroup Android build system added support for building translated binaries used on natively bridged targets (arm on x86 for example). However in order to avoid building unnecessary binaries and libraries for such architectures most modules do not support native bridge by default. All needed modules have to explicitly indicate if they may be used as part of translated binary build. This change enabled native bridge support for libprocessgroup modules needed by libutils greylisted library (available for apps targeting Android version < N). Bug: http://b/77159578 Test: make Change-Id: I8d6f33e95e9f7424f5fa12f6fbabafa1d6c37413 --- libprocessgroup/Android.bp | 2 ++ libprocessgroup/cgrouprc/Android.bp | 2 ++ libprocessgroup/cgrouprc_format/Android.bp | 1 + 3 files changed, 5 insertions(+) diff --git a/libprocessgroup/Android.bp b/libprocessgroup/Android.bp index 0207a7540..52a297c01 100644 --- a/libprocessgroup/Android.bp +++ b/libprocessgroup/Android.bp @@ -3,6 +3,7 @@ cc_library_headers { vendor_available: true, recovery_available: true, host_supported: true, + native_bridge_supported: true, export_include_dirs: ["include"], target: { linux_bionic: { @@ -25,6 +26,7 @@ cc_library { host_supported: true, recovery_available: true, vendor_available: true, + native_bridge_supported: true, vndk: { enabled: true, support_system_process: true, diff --git a/libprocessgroup/cgrouprc/Android.bp b/libprocessgroup/cgrouprc/Android.bp index 6848620f9..24652fb2f 100644 --- a/libprocessgroup/cgrouprc/Android.bp +++ b/libprocessgroup/cgrouprc/Android.bp @@ -21,6 +21,7 @@ cc_library { // modules should use libprocessgroup which links to the LL-NDK library // defined below. The static library is built for tests. vendor_available: false, + native_bridge_supported: true, srcs: [ "cgroup_controller.cpp", "cgroup_file.cpp", @@ -55,6 +56,7 @@ cc_library { llndk_library { name: "libcgrouprc", symbol_file: "libcgrouprc.map.txt", + native_bridge_supported: true, export_include_dirs: [ "include", ], diff --git a/libprocessgroup/cgrouprc_format/Android.bp b/libprocessgroup/cgrouprc_format/Android.bp index dfbeed73e..559a869f8 100644 --- a/libprocessgroup/cgrouprc_format/Android.bp +++ b/libprocessgroup/cgrouprc_format/Android.bp @@ -16,6 +16,7 @@ cc_library_static { name: "libcgrouprc_format", host_supported: true, recovery_available: true, + native_bridge_supported: true, srcs: [ "cgroup_controller.cpp", ], From 15f8ce36e298051d1f3836a814d705ac69268b15 Mon Sep 17 00:00:00 2001 From: dimitry Date: Thu, 16 May 2019 14:20:31 +0200 Subject: [PATCH 6/6] Enable native_bridge_support for libvndksupport Android build system added support for building translated binaries used on natively bridged targets (arm on x86 for example). However in order to avoid building unnecessary binaries and libraries for such architectures most modules do not support native bridge by default. All needed modules have to explicitly indicate if they may be used as part of translated binary build. This change enabled native bridge support for libvndksupport a dependency of libutils greylisted library (available for apps targeting Android version < N). Bug: http://b/77159578 Test: make Change-Id: I8186718c5efee25261a9946ffb52df5f675bec26 --- libvndksupport/Android.bp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libvndksupport/Android.bp b/libvndksupport/Android.bp index 546c15c24..e5b536cae 100644 --- a/libvndksupport/Android.bp +++ b/libvndksupport/Android.bp @@ -2,6 +2,7 @@ subdirs = ["tests"] cc_library { name: "libvndksupport", + native_bridge_supported: true, srcs: ["linker.c"], cflags: [ "-Wall", @@ -22,6 +23,7 @@ cc_library { llndk_library { name: "libvndksupport", + native_bridge_supported: true, symbol_file: "libvndksupport.map.txt", export_include_dirs: ["include"], }