diff options
Diffstat (limited to 'cc/config')
| -rw-r--r-- | cc/config/arm64_device.go | 7 | ||||
| -rw-r--r-- | cc/config/global.go | 2 |
2 files changed, 2 insertions, 7 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, " "), } diff --git a/cc/config/global.go b/cc/config/global.go index dee7640b..a49e5093 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -192,7 +192,7 @@ func init() { // This is used by non-NDK modules to get jni.h. export_include_dirs doesn't help // with this, since there is no associated library. pctx.PrefixedExistentPathsForSourcesVariable("CommonNativehelperInclude", "-I", - []string{"libnativehelper/include_deprecated"}) + []string{"libnativehelper/include_jni"}) pctx.SourcePathVariable("ClangDefaultBase", ClangDefaultBase) pctx.VariableFunc("ClangBase", func(ctx android.PackageVarContext) string { |