diff options
| author | 2017-09-26 01:12:30 +0000 | |
|---|---|---|
| committer | 2017-09-26 01:12:30 +0000 | |
| commit | 3bea186bc5ee60b36a5b2377c47c0895a8dc8c8c (patch) | |
| tree | cc54e734b57b1a519f76af2b7be3a19b0638bfa2 | |
| parent | fdb573147e4deff1a06c4aa6839c43f42865f138 (diff) | |
| parent | cb2c92961c7217ac2bdd6bbd94849b087cb2fbc9 (diff) | |
Merge "Remove duplication of bootclasspath in DefaultLibraries"
| -rw-r--r-- | java/config/config.go | 3 | ||||
| -rw-r--r-- | java/config/makevars.go | 1 | ||||
| -rw-r--r-- | java/java.go | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/java/config/config.go b/java/config/config.go index 3029a5a9c..4f74ef2a3 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -26,7 +26,8 @@ import ( 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 eda6c09fc..937d597a4 100644 --- a/java/config/makevars.go +++ b/java/config/makevars.go @@ -26,6 +26,7 @@ func init() { 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 43f97acda..5e063a527 100644 --- a/java/java.go +++ b/java/java.go @@ -258,7 +258,7 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) { 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 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) { } } else { if j.deviceProperties.Dex { - ctx.AddDependency(ctx.Module(), bootClasspathTag, "core-oj", "core-libart") + ctx.AddDependency(ctx.Module(), bootClasspathTag, config.DefaultBootclasspathLibraries...) } } } |