diff options
| author | Jiyong Park <jiyong@google.com> | 2017-10-19 01:53:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-19 01:53:39 +0000 |
| commit | 103bcf5c2c97638badeebb581eee91836e3b689d (patch) | |
| tree | 0b10b056356e39f21ae9ac5dbf6e660ca7a26d13 | |
| parent | 55e0c71acefb11aab4f296adc1bcffb04e9ba120 (diff) | |
| parent | 5b1b3341575acda0249dd1d2f3e0c8acf4094e3b (diff) | |
| download | compiler-rt-103bcf5c2c97638badeebb581eee91836e3b689d.tar.gz | |
Merge "libcompiler_rt is not directly available to vendors" am: d7d7ec0eee am: 260e2e68b9 am: 2784b8727e
am: 5b1b334157
Change-Id: Ic03667f0a8a602618b40e99ee6d89a78201fecc6
| -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"], }, |