From 61c325ebcce0a1e2ac9149d28ae00e69a269dd93 Mon Sep 17 00:00:00 2001 From: Ulya Trafimovich Date: Mon, 25 Nov 2019 15:12:48 +0000 Subject: Do not dexpreopt system server jars from updatable modules. Test: m Test: The list of updatable system server jars is empty now, so I tested that the filer works with a manual experiment: - temporarily add ethernet-service to PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS - m nothing - fgrep -e 'ethernet-service' $ANDROID_BUILD_TOP/out/soong/build.ninja | grep dexpreopt - expect empty output (no dexpreopt command is generated) Change-Id: I0b231e823d5a5a97632daa2b5eb7be3e06782004 --- java/dexpreopt_config.go | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'java') diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go index 15f11e11c..4747c645c 100644 --- a/java/dexpreopt_config.go +++ b/java/dexpreopt_config.go @@ -15,7 +15,6 @@ package java import ( - "fmt" "path/filepath" "strings" @@ -66,16 +65,6 @@ func setDexpreoptTestGlobalConfig(config android.Config, globalConfig dexpreopt. var dexpreoptGlobalConfigKey = android.NewOnceKey("DexpreoptGlobalConfig") var dexpreoptTestGlobalConfigKey = android.NewOnceKey("TestDexpreoptGlobalConfig") -// Expected format for apexJarValue = : -func splitApexJarPair(apexJarValue string) (string, string) { - var apexJarPair []string = strings.SplitN(apexJarValue, ":", 2) - if apexJarPair == nil || len(apexJarPair) != 2 { - panic(fmt.Errorf("malformed apexJarValue: %q, expected format: :", - apexJarValue)) - } - return apexJarPair[0], apexJarPair[1] -} - // systemServerClasspath returns the on-device locations of the modules in the system server classpath. It is computed // once the first time it is called for any ctx.Config(), and returns the same slice for all future calls with the same // ctx.Config(). @@ -89,9 +78,9 @@ func systemServerClasspath(ctx android.PathContext) []string { filepath.Join("/system/framework", m+".jar")) } for _, m := range global.UpdatableSystemServerJars { - apex, jar := splitApexJarPair(m) + apex, jar := dexpreopt.SplitApexJarPair(m) systemServerClasspathLocations = append(systemServerClasspathLocations, - filepath.Join("/apex", apex, "javalib", jar + ".jar")) + filepath.Join("/apex", apex, "javalib", jar+".jar")) } return systemServerClasspathLocations }) -- cgit v1.2.3-59-g8ed1b