Merge "Fix crash on test failure"
diff --git a/android/config.go b/android/config.go
index 07e25f3..630785b 100644
--- a/android/config.go
+++ b/android/config.go
@@ -299,7 +299,10 @@
func (c *config) fromEnv() error {
switch c.Getenv("EXPERIMENTAL_USE_OPENJDK9") {
case "":
- // Use OpenJDK8
+ if c.Getenv("RUN_ERROR_PRONE") != "true" {
+ // Use OpenJDK9, but target 1.8
+ c.useOpenJDK9 = true
+ }
case "false":
// Use OpenJDK8
case "1.8":
@@ -310,7 +313,7 @@
c.useOpenJDK9 = true
c.targetOpenJDK9 = true
default:
- return fmt.Errorf(`Invalid value for EXPERIMENTAL_USE_OPENJDK9, should be "", "1.8", or "true"`)
+ return fmt.Errorf(`Invalid value for EXPERIMENTAL_USE_OPENJDK9, should be "", "false", "1.8", or "true"`)
}
return nil
@@ -585,7 +588,7 @@
}
func (c *config) UseD8Desugar() bool {
- return c.IsEnvTrue("USE_D8_DESUGAR")
+ return !c.IsEnvFalse("USE_D8_DESUGAR")
}
func (c *config) UseGoma() bool {
diff --git a/cc/androidmk.go b/cc/androidmk.go
index efd4ee7..e78c419 100644
--- a/cc/androidmk.go
+++ b/cc/androidmk.go
@@ -355,7 +355,7 @@
func (c *vndkPrebuiltLibraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {
ret.Class = "SHARED_LIBRARIES"
- ret.SubName = vndkSuffix + c.version()
+ ret.SubName = c.NameSuffix()
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) {
c.libraryDecorator.androidMkWriteExportedFlags(w)
diff --git a/cc/tidy.go b/cc/tidy.go
index 67fd3db..8ca94ef 100644
--- a/cc/tidy.go
+++ b/cc/tidy.go
@@ -80,6 +80,7 @@
// If clang-tidy is not enabled globally, add the -quiet flag.
if !ctx.Config().ClangTidy() {
flags.TidyFlags = append(flags.TidyFlags, "-quiet")
+ flags.TidyFlags = append(flags.TidyFlags, "-extra-arg-before=-fno-caret-diagnostics")
}
// We might be using the static analyzer through clang tidy.
diff --git a/cc/vndk_prebuilt.go b/cc/vndk_prebuilt.go
index 9ccab03..b4fcb57 100644
--- a/cc/vndk_prebuilt.go
+++ b/cc/vndk_prebuilt.go
@@ -47,8 +47,11 @@
// }
//
type vndkPrebuiltProperties struct {
- // VNDK snapshot version that is formated as {SDK_ver}.{Major}.{Minor}.
- Version string
+ // VNDK snapshot version.
+ Version *string
+
+ // Target arch name of the snapshot (e.g. 'arm64' for variant 'aosp_arm64_ab')
+ Target_arch *string
// Prebuilt files for each arch.
Srcs []string `android:"arch_variant"`
@@ -60,15 +63,26 @@
}
func (p *vndkPrebuiltLibraryDecorator) Name(name string) string {
- return name + vndkSuffix + p.version()
+ return name + p.NameSuffix()
+}
+
+func (p *vndkPrebuiltLibraryDecorator) NameSuffix() string {
+ if p.arch() != "" {
+ return vndkSuffix + p.version() + "." + p.arch()
+ }
+ return vndkSuffix + p.version()
}
func (p *vndkPrebuiltLibraryDecorator) version() string {
- return p.properties.Version
+ return String(p.properties.Version)
+}
+
+func (p *vndkPrebuiltLibraryDecorator) arch() string {
+ return String(p.properties.Target_arch)
}
func (p *vndkPrebuiltLibraryDecorator) linkerFlags(ctx ModuleContext, flags Flags) Flags {
- p.libraryDecorator.libName = strings.TrimSuffix(ctx.ModuleName(), vndkSuffix+p.version())
+ p.libraryDecorator.libName = strings.TrimSuffix(ctx.ModuleName(), p.NameSuffix())
return p.libraryDecorator.linkerFlags(ctx, flags)
}
diff --git a/ui/build/config.go b/ui/build/config.go
index c975243..f2511e7 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -152,7 +152,16 @@
if override, ok := ret.environ.Get("OVERRIDE_ANDROID_JAVA_HOME"); ok {
return override
}
- if v, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK9"); ok && v != "" && v != "false" {
+ v, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK9")
+ if !ok {
+ v2, ok2 := ret.environ.Get("RUN_ERROR_PRONE")
+ if ok2 && (v2 == "true") {
+ v = "false"
+ } else {
+ v = "1.8"
+ }
+ }
+ if v != "false" {
return java9Home
}
return java8Home