diff options
| author | Elliott Hughes <enh@google.com> | 2013-10-08 10:10:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-08 10:10:51 -0700 |
| commit | 1180d71c3062a4f5b124ced3693a6a937ffbc13a (patch) | |
| tree | 7cdae57404dc8ed8c4a9fbfc8bbbbc5b7c49ec57 /core/combo | |
| parent | 0b42554fd8c7a43ca45504e4586f1eef578308de (diff) | |
| parent | 2c448765e1227327da7ce548114f13678baa9606 (diff) | |
| download | build-1180d71c3062a4f5b124ced3693a6a937ffbc13a.zip build-1180d71c3062a4f5b124ced3693a6a937ffbc13a.tar.gz build-1180d71c3062a4f5b124ced3693a6a937ffbc13a.tar.bz2 | |
am 2c448765: Merge "Remove explicit passing of dynamic loader name"
* commit '2c448765e1227327da7ce548114f13678baa9606':
Remove explicit passing of dynamic loader name
Diffstat (limited to 'core/combo')
| -rwxr-xr-x | core/combo/TARGET_linux-x86.mk | 1 | ||||
| -rwxr-xr-x | core/combo/TARGET_linux-x86_64.mk | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 64fafbf..92eeee5 100755 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -236,7 +236,6 @@ define transform-o-to-executable-inner $(hide) $(PRIVATE_CXX) \ $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ -nostdlib -Bdynamic \ - -Wl,-dynamic-linker,/system/bin/linker \ -Wl,-z,nocopyreloc \ -fPIE -pie \ $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk index eeecf98..86d29f5 100755 --- a/core/combo/TARGET_linux-x86_64.mk +++ b/core/combo/TARGET_linux-x86_64.mk @@ -234,7 +234,6 @@ define transform-o-to-executable-inner $(hide) $(PRIVATE_CXX) \ $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ -nostdlib -Bdynamic \ - -Wl,-dynamic-linker,/system/bin/linker \ -Wl,-z,nocopyreloc \ -fPIE -pie \ $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ |