diff options
author | Ying Wang <wangying@android.com> | 2015-01-16 00:28:48 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-16 00:28:48 +0000 |
commit | 758a029e2a7dbe6169fbccd8680e2856ae57ee8b (patch) | |
tree | a6cf12d95abcc98652dc541aff8b9116f1b844d0 /core/combo | |
parent | 0c949bd86773c5d39df11cd824c9df372dc00342 (diff) | |
parent | 59cbe2c65cdd2dc3f1ef7a64a4bf6e3543d07207 (diff) | |
download | build-758a029e2a7dbe6169fbccd8680e2856ae57ee8b.zip build-758a029e2a7dbe6169fbccd8680e2856ae57ee8b.tar.gz build-758a029e2a7dbe6169fbccd8680e2856ae57ee8b.tar.bz2 |
am 59cbe2c6: Merge "Emit unique linker buildid in all binaries."
* commit '59cbe2c65cdd2dc3f1ef7a64a4bf6e3543d07207':
Emit unique linker buildid in all binaries.
Diffstat (limited to 'core/combo')
-rw-r--r-- | core/combo/TARGET_linux-arm.mk | 1 | ||||
-rw-r--r-- | core/combo/TARGET_linux-arm64.mk | 1 | ||||
-rw-r--r-- | core/combo/TARGET_linux-mips.mk | 1 | ||||
-rw-r--r-- | core/combo/TARGET_linux-mips64.mk | 1 | ||||
-rw-r--r-- | core/combo/TARGET_linux-x86.mk | 1 | ||||
-rw-r--r-- | core/combo/TARGET_linux-x86_64.mk | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index c1f3665..8059b2a 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -133,6 +133,7 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += \ -Wl,-z,noexecstack \ -Wl,-z,relro \ -Wl,-z,now \ + -Wl,--build-id=md5 \ -Wl,--warn-shared-textrel \ -Wl,--fatal-warnings \ -Wl,--icf=safe \ diff --git a/core/combo/TARGET_linux-arm64.mk b/core/combo/TARGET_linux-arm64.mk index c1fddb2..abd8e3a 100644 --- a/core/combo/TARGET_linux-arm64.mk +++ b/core/combo/TARGET_linux-arm64.mk @@ -108,6 +108,7 @@ TARGET_GLOBAL_LDFLAGS += \ -Wl,-z,noexecstack \ -Wl,-z,relro \ -Wl,-z,now \ + -Wl,--build-id=md5 \ -Wl,--warn-shared-textrel \ -Wl,--fatal-warnings \ -Wl,-maarch64linux \ diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk index f851af4..e3b4827 100644 --- a/core/combo/TARGET_linux-mips.mk +++ b/core/combo/TARGET_linux-mips.mk @@ -104,6 +104,7 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += \ -Wl,-z,noexecstack \ -Wl,-z,relro \ -Wl,-z,now \ + -Wl,--build-id=md5 \ -Wl,--warn-shared-textrel \ -Wl,--fatal-warnings \ $(arch_variant_ldflags) diff --git a/core/combo/TARGET_linux-mips64.mk b/core/combo/TARGET_linux-mips64.mk index 2a30f3f..f3ba18c 100644 --- a/core/combo/TARGET_linux-mips64.mk +++ b/core/combo/TARGET_linux-mips64.mk @@ -104,6 +104,7 @@ TARGET_GLOBAL_LDFLAGS += \ -Wl,-z,noexecstack \ -Wl,-z,relro \ -Wl,-z,now \ + -Wl,--build-id=md5 \ -Wl,--warn-shared-textrel \ -Wl,--fatal-warnings \ $(arch_variant_ldflags) diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index c2188c0..e22500e 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -122,6 +122,7 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += -m32 $(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += -Wl,-z,noexecstack $(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += -Wl,-z,relro -Wl,-z,now +$(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += -Wl,--build-id=md5 $(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += -Wl,--warn-shared-textrel $(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += -Wl,--fatal-warnings $(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += -Wl,--gc-sections diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk index 6581f64..d92e974 100644 --- a/core/combo/TARGET_linux-x86_64.mk +++ b/core/combo/TARGET_linux-x86_64.mk @@ -127,6 +127,7 @@ TARGET_GLOBAL_LDFLAGS += -m64 TARGET_GLOBAL_LDFLAGS += -Wl,-z,noexecstack TARGET_GLOBAL_LDFLAGS += -Wl,-z,relro -Wl,-z,now +TARGET_GLOBAL_LDFLAGS += -Wl,--build-id=md5 TARGET_GLOBAL_LDFLAGS += -Wl,--warn-shared-textrel TARGET_GLOBAL_LDFLAGS += -Wl,--fatal-warnings TARGET_GLOBAL_LDFLAGS += -Wl,--gc-sections |