diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-05-10 21:13:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-05-10 21:13:58 +0000 |
| commit | e8b585e18b4308e0d79327c5e9db546d7c37902e (patch) | |
| tree | 9a6b7af1fda4304cdc8b67a40c399fab5285ae10 | |
| parent | f41ad204147649aff2602b0300ce64e8c588b42d (diff) | |
| parent | 1ecd1da72c5418a09e57b53ad8922ce141c386f2 (diff) | |
| download | compiler-rt-e8b585e18b4308e0d79327c5e9db546d7c37902e.tar.gz | |
Merge "Revert "Android.bp: workaround static lib ordering""
| -rw-r--r-- | Android.bp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/Android.bp b/Android.bp index dc6496c89..c84136328 100644 --- a/Android.bp +++ b/Android.bp @@ -363,29 +363,24 @@ cc_library { ldflags: ["-Wl,--exclude-libs,libunwind_llvm.a"], }, android_arm64: { - // b/26968262 liblzma needs to be after libunwindbacktrace - static_libs: ["libunwindbacktrace","liblzma"], + static_libs: ["libunwindbacktrace"], ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a"], }, android_mips: { - // b/26968262 liblzma needs to be after libunwindbacktrace - static_libs: ["libunwindbacktrace","liblzma"], + static_libs: ["libunwindbacktrace"], ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a"], }, android_mips64: { - // b/26968262 liblzma needs to be after libunwindbacktrace - static_libs: ["libunwindbacktrace","liblzma"], + static_libs: ["libunwindbacktrace"], ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a"], }, android_x86: { - // b/26968262 liblzma needs to be after libunwindbacktrace - static_libs: ["libunwindbacktrace","liblzma"], + static_libs: ["libunwindbacktrace"], ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a"], }, android_x86_64: { srcs: ["lib/builtins/ppc/floatditf.c"], - // b/26968262 liblzma needs to be after libunwindbacktrace - static_libs: ["libunwindbacktrace","liblzma"], + static_libs: ["libunwindbacktrace"], ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a"], }, linux: { |