Merge "Don't install stubs"
diff --git a/apex/apex.go b/apex/apex.go
index e268499..f412d86 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -457,6 +457,10 @@
}
}
+func (a *apexBundle) Srcs() android.Paths {
+ return android.Paths{a.outputFiles[imageApex]}
+}
+
func getCopyManifestForNativeLibrary(cc *cc.Module) (fileToCopy android.Path, dirInApex string) {
// Decide the APEX-local directory by the multilib of the library
// In the future, we may query this to the module.
diff --git a/cc/config/clang.go b/cc/config/clang.go
index d0d199b..c070bf2 100644
--- a/cc/config/clang.go
+++ b/cc/config/clang.go
@@ -120,9 +120,6 @@
// color codes if it is not running in a terminal.
"-fcolor-diagnostics",
- // http://b/29823425 Disable -Wexpansion-to-defined for Clang update to r271374
- "-Wno-expansion-to-defined",
-
// http://b/68236239 Allow 0/NULL instead of using nullptr everywhere.
"-Wno-zero-as-null-pointer-constant",
diff --git a/cc/config/x86_windows_host.go b/cc/config/x86_windows_host.go
index e23c0a0..dfdd40c 100644
--- a/cc/config/x86_windows_host.go
+++ b/cc/config/x86_windows_host.go
@@ -33,9 +33,9 @@
// Use C99-compliant printf functions (%zd).
"-D__USE_MINGW_ANSI_STDIO=1",
- // Admit to using >= Vista. Both are needed because of <_mingw.h>.
- "-D_WIN32_WINNT=0x0600",
- "-DWINVER=0x0600",
+ // Admit to using >= Windows 7. Both are needed because of <_mingw.h>.
+ "-D_WIN32_WINNT=0x0601",
+ "-DWINVER=0x0601",
// Get 64-bit off_t and related functions.
"-D_FILE_OFFSET_BITS=64",