Merge "Enforce correct rust library file names." am: 5a4b36499d am: 4a66bfdb7a
am: 6af99ed85d
Change-Id: Ie0ea000edb21011c9c766b605e2ddb4b5ba0f593
diff --git a/cc/config/vndk.go b/cc/config/vndk.go
index 3e8abac..28eb509 100644
--- a/cc/config/vndk.go
+++ b/cc/config/vndk.go
@@ -107,6 +107,8 @@
"libaudioutils",
"libbinder",
"libcamera_metadata",
+ "libcodec2_hidl@1.0",
+ "libcodec2_vndk",
"libcrypto",
"libdiskconfig",
"libdumpstateutil",
@@ -130,6 +132,7 @@
"libsqlite",
"libssl",
"libstagefright_amrnb_common",
+ "libstagefright_bufferpool@2.0",
"libstagefright_bufferqueue_helper",
"libstagefright_enc_common",
"libstagefright_flacdec",
@@ -157,6 +160,7 @@
"libstagefright_soft_vorbisdec",
"libstagefright_soft_vpxdec",
"libstagefright_soft_vpxenc",
+ "libstagefright_softomx",
"libstagefright_xmlparser",
"libsysutils",
"libtinyxml2",
diff --git a/dexpreopt/dexpreopt.go b/dexpreopt/dexpreopt.go
index 46e0f0a..6f92153 100644
--- a/dexpreopt/dexpreopt.go
+++ b/dexpreopt/dexpreopt.go
@@ -495,8 +495,7 @@
}
for _, f := range global.PatternsOnSystemOther {
- // See comment of SYSTEM_OTHER_ODEX_FILTER for details on the matching.
- if makefileMatch("/"+f, dexLocation) || makefileMatch(filepath.Join(SystemPartition, f), dexLocation) {
+ if makefileMatch(filepath.Join(SystemPartition, f), dexLocation) {
return true
}
}
diff --git a/dexpreopt/dexpreopt_test.go b/dexpreopt/dexpreopt_test.go
index 6f8120e..820f9e7 100644
--- a/dexpreopt/dexpreopt_test.go
+++ b/dexpreopt/dexpreopt_test.go
@@ -103,12 +103,13 @@
{module: productModule, expectedPartition: "product"},
},
},
+ // product/app/% only applies to product apps inside the system partition
{
patterns: []string{"app/%", "product/app/%"},
moduleTests: []moduleTest{
{module: systemModule, expectedPartition: "system_other/system"},
{module: systemProductModule, expectedPartition: "system_other/system/product"},
- {module: productModule, expectedPartition: "system_other/product"},
+ {module: productModule, expectedPartition: "product"},
},
},
}
@@ -128,7 +129,7 @@
}
if rule.Installs().String() != wantInstalls.String() {
- t.Errorf("\npatterns: %v\nwant installs:\n %v\ngot:\n %v", test.patterns, wantInstalls, rule.Installs())
+ t.Errorf("\nwant installs:\n %v\ngot:\n %v", wantInstalls, rule.Installs())
}
}
}
diff --git a/java/config/config.go b/java/config/config.go
index f418ee7..1c55961 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -88,10 +88,10 @@
})
pctx.VariableFunc("JlinkVersion", func(ctx android.PackageVarContext) string {
switch ctx.Config().Getenv("EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN") {
- case "true":
- return "11"
- default:
+ case "false":
return "9"
+ default:
+ return "11"
}
})
diff --git a/ui/build/config.go b/ui/build/config.go
index 919b9ce..686ca3e 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -219,10 +219,10 @@
if override, ok := ret.environ.Get("OVERRIDE_ANDROID_JAVA_HOME"); ok {
return override
}
- if toolchain11, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN"); ok && toolchain11 == "true" {
- return java11Home
+ if toolchain9, ok := ret.environ.Get("EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN"); ok && toolchain9 == "false" {
+ return java9Home
}
- return java9Home
+ return java11Home
}()
absJavaHome := absPath(ctx, javaHome)