diff options
| author | Ying Wang <wangying@google.com> | 2015-03-05 20:05:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-05 20:05:17 +0000 |
| commit | a7c669f25b087c02fae43d8ead9e9ebae3f448a3 (patch) | |
| tree | ae1b860c5a7a374299cdcb78a28b53f2c15c583c | |
| parent | 9b19382f0e55be199da4b3f604fc114aba8fb2fc (diff) | |
| parent | 71c64dc1033aed7de0ebb215fc35d09e7fcd9db0 (diff) | |
| download | build-a7c669f25b087c02fae43d8ead9e9ebae3f448a3.zip build-a7c669f25b087c02fae43d8ead9e9ebae3f448a3.tar.gz build-a7c669f25b087c02fae43d8ead9e9ebae3f448a3.tar.bz2 | |
am 71c64dc1: Merge "Reorder lib paths in transform-bc-to-so to avoid build race condition."
* commit '71c64dc1033aed7de0ebb215fc35d09e7fcd9db0':
Reorder lib paths in transform-bc-to-so to avoid build race condition.
| -rw-r--r-- | core/definitions.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index e0f61c5..4bc51d3 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -885,7 +885,7 @@ $(hide) $(PRIVATE_CXX) -shared -Wl,-soname,$(notdir $@) -nostdlib \ $(dir $@)/$(notdir $(<:.bc=.o)) \ $(RS_PREBUILT_COMPILER_RT) \ -o $@ $(TARGET_GLOBAL_LDFLAGS) -Wl,--hash-style=sysv -L prebuilts/gcc/ \ - -L $(TARGET_OUT_INTERMEDIATE_LIBRARIES) $(RS_PREBUILT_LIBPATH) \ + $(RS_PREBUILT_LIBPATH) -L $(TARGET_OUT_INTERMEDIATE_LIBRARIES) \ -lRSSupport -lm -lc endef |