diff options
| author | Bill Peckham <bpeckham@google.com> | 2021-03-11 16:06:41 -0800 |
|---|---|---|
| committer | Bill Peckham <bpeckham@google.com> | 2021-03-11 16:06:41 -0800 |
| commit | d8387c773e9bec30d679c43b7231f31aaa81f35a (patch) | |
| tree | 3d5cbc42cf733fe3b51986c8d4f60758b1a9dba5 /java/java.go | |
| parent | 5d3f9994e5a0e1732dbe88d5d0fada1ce0fbd7e2 (diff) | |
| parent | 4338a527766b9bae0de28347e60b033abb30f3ec (diff) | |
Merge spl-2021-03-05
Change-Id: Iaef6bd0f064f5d6be062d92ba9cffd9a782a8e69
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/java/java.go b/java/java.go index a1dda1f26..adeb0f7cc 100644 --- a/java/java.go +++ b/java/java.go @@ -533,7 +533,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"} @@ -670,12 +669,6 @@ func sdkDeps(ctx android.BottomUpMutatorContext, sdkContext sdkContext, d dexer) 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") - } } func (j *Module) deps(ctx android.BottomUpMutatorContext) { @@ -1031,26 +1024,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. - var exportPackage android.Path - if androidAppImport, ok := dep.(*AndroidAppImport); ok { - exportPackage = androidAppImport.ExportPackage() - } else { - exportPackage = dep.(*AndroidApp).exportPackage - } - if exportPackage != nil { - deps.staticResourceJars = append(deps.staticResourceJars, exportPackage) - } - } case kotlinStdlibTag: deps.kotlinStdlib = append(deps.kotlinStdlib, dep.HeaderJars()...) case kotlinAnnotationsTag: |