Merge "Allow conscrypt to depend on core.intra.stubs"
diff --git a/README.md b/README.md
index 9f427c4..16d3cce 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@
all Android.bp files.
For a list of valid module types and their properties see
-[$OUT_DIR/soong/.bootstrap/docs/soong_build.html](https://go/Android.bp).
+[$OUT_DIR/soong/.bootstrap/docs/soong_build.html](http://go/Android.bp).
### Globs
diff --git a/cc/compiler.go b/cc/compiler.go
index f3cf040..5ef9e4e 100644
--- a/cc/compiler.go
+++ b/cc/compiler.go
@@ -444,16 +444,6 @@
cppStd = strings.Replace(String(compiler.Properties.Cpp_std), "17", "1z", 1)
}
- if !flags.Clang {
- // GCC uses an invalid C++14 ABI (emits calls to
- // __cxa_throw_bad_array_length, which is not a valid C++ RT ABI).
- // http://b/25022512
- // The host GCC doesn't support C++14 (and is deprecated, so likely
- // never will).
- // Build these modules with C++11.
- cppStd = config.GccCppStdVersion
- }
-
if compiler.Properties.Gnu_extensions != nil && *compiler.Properties.Gnu_extensions == false {
cStd = gnuToCReplacer.Replace(cStd)
cppStd = gnuToCReplacer.Replace(cppStd)
diff --git a/cc/config/global.go b/cc/config/global.go
index 8b02f02..000aab6 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -119,7 +119,6 @@
CStdVersion = "gnu99"
CppStdVersion = "gnu++14"
- GccCppStdVersion = "gnu++11"
ExperimentalCStdVersion = "gnu11"
ExperimentalCppStdVersion = "gnu++1z"
diff --git a/ui/build/finder.go b/ui/build/finder.go
index 6dc35a0..3130f74 100644
--- a/ui/build/finder.go
+++ b/ui/build/finder.go
@@ -62,6 +62,7 @@
"Android.bp",
"Blueprints",
"CleanSpec.mk",
+ "OWNERS",
"TEST_MAPPING",
},
}
@@ -102,10 +103,16 @@
ctx.Fatalf("Could not export module list: %v", err)
}
+ owners := f.FindNamedAt(".", "OWNERS")
+ err = dumpListToFile(owners, filepath.Join(dumpDir, "OWNERS.list"))
+ if err != nil {
+ ctx.Fatalf("Could not find OWNERS: %v", err)
+ }
+
testMappings := f.FindNamedAt(".", "TEST_MAPPING")
err = dumpListToFile(testMappings, filepath.Join(dumpDir, "TEST_MAPPING.list"))
if err != nil {
- ctx.Fatalf("Could not find modules: %v", err)
+ ctx.Fatalf("Could not find TEST_MAPPING: %v", err)
}
androidBps := f.FindNamedAt(".", "Android.bp")