diff options
| author | Jiyong Park <jiyong@google.com> | 2017-10-19 01:42:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-19 01:42:18 +0000 |
| commit | 2784b8727e710ea144de9b33227feb7839b4bf9a (patch) | |
| tree | 8221b900e7418c85160072427a618c6d20f51271 | |
| parent | 91d3f134cf45df18b1a6031a7ac684bb9a9059d7 (diff) | |
| parent | 260e2e68b9b12fbb1d40a573e9a6cd0c04498c7a (diff) | |
| download | compiler-rt-2784b8727e710ea144de9b33227feb7839b4bf9a.tar.gz | |
Merge "libcompiler_rt is not directly available to vendors" am: d7d7ec0eee
am: 260e2e68b9
Change-Id: If79291dbb8eead90378f45dc47da016a4b6c4fca
| -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"], }, |