Revert "remove telephony-common from boot class path"
This reverts commit 66f60ec1145c1ec98db9b7ace4d353656df944cf.
Reason for revert: <performance regression>
Change-Id: I349c58cb3f4fdb7dc02ffa06f26da1293488d58b
Bug: 140639952
diff --git a/dexpreopt/dexpreopt.go b/dexpreopt/dexpreopt.go
index 871aa36..c378f09 100644
--- a/dexpreopt/dexpreopt.go
+++ b/dexpreopt/dexpreopt.go
@@ -277,10 +277,6 @@
var conditionalClassLoaderContextHost29 android.Paths
var conditionalClassLoaderContextTarget29 []string
- // Extra paths that will be appended to the class loader if the APK manifest has targetSdkVersion < 30
- var conditionalClassLoaderContextHost30 android.Paths
- var conditionalClassLoaderContextTarget30 []string
-
var classLoaderContextHostString string
if module.EnforceUsesLibraries {
@@ -326,15 +322,6 @@
conditionalClassLoaderContextTarget29 = append(conditionalClassLoaderContextTarget29,
filepath.Join("/system/framework", hidlBase+".jar"))
- const telephonyCommon = "telephony-common";
- // android telephony-common contains classes that were in the default class path util API 30.
- // If the targetSdkTargetVersion int the manifest for APK is < 30 then implicitly add the class
- // to the classpath for dexpreopt
- conditionalClassLoaderContextHost30 = append(conditionalClassLoaderContextHost30,
- pathForLibrary(module, telephonyCommon))
- conditionalClassLoaderContextTarget30 = append(conditionalClassLoaderContextTarget30,
- filepath.Join("/system/framework", telephonyCommon+".jar"))
-
classLoaderContextHostString = strings.Join(classLoaderContextHost.Strings(), ":")
} else {
// Pass special class loader context to skip the classpath and collision check.
@@ -381,11 +368,6 @@
Implicits(conditionalClassLoaderContextHost29)
rule.Command().Textf(`conditional_target_libs_29="%s"`,
strings.Join(conditionalClassLoaderContextTarget29, " "))
- rule.Command().Textf(`conditional_host_libs_30="%s"`,
- strings.Join(conditionalClassLoaderContextHost30.Strings(), " ")).
- Implicits(conditionalClassLoaderContextHost30)
- rule.Command().Textf(`conditional_target_libs_30="%s"`,
- strings.Join(conditionalClassLoaderContextTarget30, " "))
rule.Command().Text("source").Tool(global.Tools.ConstructContext).Input(module.DexPath)
}
diff --git a/java/app.go b/java/app.go
index 27fd87e..0af89fd 100644
--- a/java/app.go
+++ b/java/app.go
@@ -1106,8 +1106,7 @@
ctx.AddVariationDependencies(nil, usesLibTag,
"org.apache.http.legacy",
"android.hidl.base-V1.0-java",
- "android.hidl.manager-V1.0-java",
- "telephony-common",)
+ "android.hidl.manager-V1.0-java")
}
}
}
diff --git a/java/testing.go b/java/testing.go
index 555bc58..a37c0a9 100644
--- a/java/testing.go
+++ b/java/testing.go
@@ -100,14 +100,6 @@
system_modules: "core-platform-api-stubs-system-modules",
installable: true,
}
-
- java_library {
- name: "telephony-common",
- srcs: ["a.java"],
- sdk_version: "none",
- system_modules: "core-platform-api-stubs-system-modules",
- installable: true,
- }
`
systemModules := []string{
