diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-18 00:07:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-18 00:07:22 +0000 |
| commit | 8e25667f12c9ee0e396a398ed5cfd274ad792de3 (patch) | |
| tree | 78afcf399aecf9aa2a0e1a87f4a09fd7df44b8f6 /core/binary.mk | |
| parent | 85e73042db75f4fd64eaf3fc6b00a342b6859059 (diff) | |
| parent | a4ad6442d6a54c9eaf771a0d4ab7f7ab9de163ac (diff) | |
| download | build-8e25667f12c9ee0e396a398ed5cfd274ad792de3.zip build-8e25667f12c9ee0e396a398ed5cfd274ad792de3.tar.gz build-8e25667f12c9ee0e396a398ed5cfd274ad792de3.tar.bz2 | |
am a4ad6442: am 9b0ccb74: Merge "Fix the libgcc/libatomic link order."
* commit 'a4ad6442d6a54c9eaf771a0d4ab7f7ab9de163ac':
Fix the libgcc/libatomic link order.
Diffstat (limited to 'core/binary.mk')
| -rw-r--r-- | core/binary.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/binary.mk b/core/binary.mk index 8365e37..b067a99 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -1022,7 +1022,6 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_IMPORT_INCLUDES := $(import_includes) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_LDFLAGS := $(my_ldflags) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_LDLIBS := $(my_ldlibs) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_NO_CRT := $(strip $(LOCAL_NO_CRT) $(LOCAL_NO_CRT_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))) -$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_LIBCXX := $(my_libcxx) # this is really the way to get the files onto the command line instead # of using $^, because then LOCAL_ADDITIONAL_DEPENDENCIES doesn't work |