Remove duplication of bootclasspath in DefaultLibraries
Don't add bootclasspath libraries as classpath dependencies too.
Test: m -j checkbuild
Change-Id: Icb45e45536ce3babab73f67d281ca593edd4ab7f
diff --git a/java/config/config.go b/java/config/config.go
index 3029a5a..4f74ef2 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -26,7 +26,8 @@
var (
pctx = android.NewPackageContext("android/soong/java/config")
- DefaultLibraries = []string{"core-oj", "core-libart", "ext", "framework", "okhttp"}
+ DefaultBootclasspathLibraries = []string{"core-oj", "core-libart"}
+ DefaultLibraries = []string{"ext", "framework", "okhttp"}
)
func init() {
diff --git a/java/config/makevars.go b/java/config/makevars.go
index eda6c09..937d597 100644
--- a/java/config/makevars.go
+++ b/java/config/makevars.go
@@ -26,6 +26,7 @@
func makeVarsProvider(ctx android.MakeVarsContext) {
ctx.Strict("TARGET_DEFAULT_JAVA_LIBRARIES", strings.Join(DefaultLibraries, " "))
+ ctx.Strict("TARGET_DEFAULT_BOOTCLASSPATH_LIBRARIES", strings.Join(DefaultBootclasspathLibraries, " "))
ctx.Strict("DEFAULT_JAVA_LANGUAGE_VERSION", "${DefaultJavaVersion}")
diff --git a/java/java.go b/java/java.go
index 43f97ac..5e063a5 100644
--- a/java/java.go
+++ b/java/java.go
@@ -258,7 +258,7 @@
if ctx.Device() {
sdkDep := decodeSdkDep(ctx, j.deviceProperties.Sdk_version)
if sdkDep.useDefaultLibs {
- ctx.AddDependency(ctx.Module(), bootClasspathTag, "core-oj", "core-libart")
+ ctx.AddDependency(ctx.Module(), bootClasspathTag, config.DefaultBootclasspathLibraries...)
ctx.AddDependency(ctx.Module(), libTag, config.DefaultLibraries...)
}
if sdkDep.useModule {
@@ -266,7 +266,7 @@
}
} else {
if j.deviceProperties.Dex {
- ctx.AddDependency(ctx.Module(), bootClasspathTag, "core-oj", "core-libart")
+ ctx.AddDependency(ctx.Module(), bootClasspathTag, config.DefaultBootclasspathLibraries...)
}
}
}