diff options
| author | Liz Kammer <eakammer@google.com> | 2020-10-16 17:53:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-16 17:53:35 +0000 |
| commit | 81768cc9cc95a0e95dfddfa9c06bc4f3a487ff0f (patch) | |
| tree | c85e2c419163621a9529b6261aa422e33b0cbea8 /java/java.go | |
| parent | 4139580eb7424a1a6e9f4ac49bd7b1feaefb134d (diff) | |
| parent | 0f35aeec67dc57395216272fe8905f13dd475747 (diff) | |
Merge "Remove special-cased stub deps on framework-res" into rvc-dev am: 0f35aeec67
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12849659
Change-Id: I4c7b013d883f0d93caa32a0cb07aa374ccb05f31
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/java/java.go b/java/java.go index 4612b76fa..69826eec3 100644 --- a/java/java.go +++ b/java/java.go @@ -578,7 +578,6 @@ var ( bootClasspathTag = dependencyTag{name: "bootclasspath"} systemModulesTag = dependencyTag{name: "system modules"} frameworkResTag = dependencyTag{name: "framework-res"} - frameworkApkTag = dependencyTag{name: "framework-apk"} kotlinStdlibTag = dependencyTag{name: "kotlin-stdlib"} kotlinAnnotationsTag = dependencyTag{name: "kotlin-annotations"} proguardRaiseTag = dependencyTag{name: "proguard-raise"} @@ -703,12 +702,6 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) { if sdkDep.systemModules != "" { ctx.AddVariationDependencies(nil, systemModulesTag, sdkDep.systemModules) } - - if ctx.ModuleName() == "android_stubs_current" || - ctx.ModuleName() == "android_system_stubs_current" || - ctx.ModuleName() == "android_test_stubs_current" { - ctx.AddVariationDependencies(nil, frameworkApkTag, "framework-res") - } } syspropPublicStubs := syspropPublicStubs(ctx.Config()) @@ -1057,18 +1050,6 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps { } else { ctx.PropertyErrorf("exported_plugins", "%q is not a java_plugin module", otherName) } - case frameworkApkTag: - if ctx.ModuleName() == "android_stubs_current" || - ctx.ModuleName() == "android_system_stubs_current" || - ctx.ModuleName() == "android_test_stubs_current" { - // framework stubs.jar need to depend on framework-res.apk, in order to pull the - // resource files out of there for aapt. - // - // Normally the package rule runs aapt, which includes the resource, - // but we're not running that in our package rule so just copy in the - // resource files here. - deps.staticResourceJars = append(deps.staticResourceJars, dep.(*AndroidApp).exportPackage) - } case kotlinStdlibTag: deps.kotlinStdlib = append(deps.kotlinStdlib, dep.HeaderJars()...) case kotlinAnnotationsTag: |