Merge changes Id9717132,I3e3b7251,I021c7971,I8a117a86,Ia5196f1f, ...
* changes:
Allow AndroidMkData.Custom handlers to extend normal values
Remove error from AndroidMkDataProvider.AndroidMk
Remove error from AndroidMkData.Custom
Remove error from AndroidMkData.Extra
Bring java support closer to current version of make
Rename java_prebuilt_library to java_import
diff --git a/cc/linker.go b/cc/linker.go
index 1a842ae..59bc9bd 100644
--- a/cc/linker.go
+++ b/cc/linker.go
@@ -232,6 +232,14 @@
}
}
+ if ctx.sdk() && (ctx.Arch().ArchType != android.Mips && ctx.Arch().ArchType != android.Mips64) {
+ // The bionic linker now has support gnu style hashes (which are much faster!), but shipping
+ // to older devices requires the old style hash. Fortunately, we can build with both and
+ // it'll work anywhere.
+ // This is not currently supported on MIPS architectures.
+ flags.LdFlags = append(flags.LdFlags, "-Wl,--hash-style=both")
+ }
+
if flags.Clang {
flags.LdFlags = append(flags.LdFlags, toolchain.ToolchainClangLdflags())
} else {