diff options
| author | Jiyong Park <jiyong@google.com> | 2017-08-23 13:17:58 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2017-10-16 23:25:43 +0900 |
| commit | 7693d3f8c79849dcd387994f11bb158150758ea2 (patch) | |
| tree | 8221b900e7418c85160072427a618c6d20f51271 | |
| parent | 7d6e9ce5da401dbd9a2a60d86690c3486a26c627 (diff) | |
| download | compiler-rt-7693d3f8c79849dcd387994f11bb158150758ea2.tar.gz | |
libcompiler_rt is not directly available to vendors
It is a member of VNDK just because libRS_internal.so, which is VNDK, is
using it. This lib is not intended to be used by vendor libraries
directly.a
In addition, libunwind is added explicitly because libunwindbacktrace no
longer includes libunwind in it.
Bug: 64730695
Test: build 2017 pixel devices
Change-Id: I11ad62eac9901b607bb85ef0c2ac2c1a5ed34655
| -rw-r--r-- | Android.bp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Android.bp b/Android.bp index c5c3db075..8331cad1c 100644 --- a/Android.bp +++ b/Android.bp @@ -72,7 +72,7 @@ cc_library_static { cc_library { name: "libcompiler_rt", - vendor_available: true, + vendor_available: false, vndk: { enabled: true, support_system_process: true, @@ -373,32 +373,32 @@ cc_library { ldflags: ["-Wl,--exclude-libs,libunwind_llvm.a"], }, android_arm64: { - static_libs: ["libunwindbacktrace"], - ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a"], + static_libs: ["libunwindbacktrace", "libunwind"], + ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a:libunwind.a"], }, android_mips: { - static_libs: ["libunwindbacktrace"], - ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a"], + static_libs: ["libunwindbacktrace", "libunwind"], + ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a:libunwind.a"], }, android_mips64: { - static_libs: ["libunwindbacktrace"], - ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a"], + static_libs: ["libunwindbacktrace", "libunwind"], + ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a:libunwind.a"], }, android_x86: { - static_libs: ["libunwindbacktrace"], - ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a"], + static_libs: ["libunwindbacktrace", "libunwind"], + ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a:libunwind.a"], }, android_x86_64: { srcs: ["lib/builtins/ppc/floatditf.c"], - static_libs: ["libunwindbacktrace"], - ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a"], + static_libs: ["libunwindbacktrace", "libunwind"], + ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a:libunwind.a"], }, linux_glibc: { - static_libs: ["libunwindbacktrace"], + static_libs: ["libunwindbacktrace", "libunwind"], shared_libs: ["liblzma"], }, windows: { - static_libs: ["libunwindbacktrace"], + static_libs: ["libunwindbacktrace", "libunwind"], // Only build enable_execute_stack.c on non-Windows hosts. exclude_srcs: ["lib/builtins/enable_execute_stack.c"], }, |