diff options
| author | Xin Li <delphij@google.com> | 2018-08-06 17:23:22 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2018-08-06 17:23:26 -0700 |
| commit | 6bfe4eb42c79d4930a71ba5ad013177b1741713f (patch) | |
| tree | 2246bd09c86a770d1a4d26b415eed543affb7df6 /cc/config/arm64_device.go | |
| parent | 77a69ecb70765f09f40c249a1546b5de7b2ee7f8 (diff) | |
| parent | 7481ee6e6d144a509a931a80d0453ad74fb5b815 (diff) | |
| download | build_soong-android-o-mr1-iot-release-1.0.3.tar.gz build_soong-android-o-mr1-iot-release-1.0.3.tar.bz2 build_soong-android-o-mr1-iot-release-1.0.3.zip | |
Merge Android Pie into masterandroid-o-mr1-iot-release-1.0.3
Bug: 112104996
Change-Id: I160274b2c2bbe8219ed9a3b5d39c3935bfcb13f0
Diffstat (limited to 'cc/config/arm64_device.go')
| -rw-r--r-- | cc/config/arm64_device.go | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/cc/config/arm64_device.go b/cc/config/arm64_device.go index 172784a7..f4125838 100644 --- a/cc/config/arm64_device.go +++ b/cc/config/arm64_device.go @@ -174,7 +174,6 @@ type toolchainArm64 struct { toolchain64Bit ldflags string - lldflags string toolchainCflags string toolchainClangCflags string } @@ -232,7 +231,7 @@ func (t *toolchainArm64) ClangLdflags() string { } func (t *toolchainArm64) ClangLldflags() string { - return t.lldflags + return "${config.Arm64Lldflags}" } func (t *toolchainArm64) ToolchainClangCflags() string { @@ -270,10 +269,6 @@ func arm64ToolchainFactory(arch android.Arch) Toolchain { "${config.Arm64Ldflags}", extraLdflags, }, " "), - lldflags: strings.Join([]string{ - "${config.Arm64Lldflags}", - extraLdflags, - }, " "), toolchainCflags: variantOrDefault(arm64CpuVariantCflagsVar, arch.CpuVariant), toolchainClangCflags: strings.Join(toolchainClangCflags, " "), } |