diff options
| author | Liz Kammer <eakammer@google.com> | 2020-10-16 18:21:33 +0000 |
|---|---|---|
| committer | Liz Kammer <eakammer@google.com> | 2020-10-16 22:41:31 +0000 |
| commit | cb7c5b4ea7b43b5e2661ddf587b62d38d1f2813b (patch) | |
| tree | 4b4f320f6c2b3e40ec1352029c6989639c510e96 | |
| parent | 21b51f197aba20f262bbb6ea509abbc69ac89025 (diff) | |
| parent | 0f35aeec67dc57395216272fe8905f13dd475747 (diff) | |
| download | soong-cb7c5b4ea7b43b5e2661ddf587b62d38d1f2813b.tar.gz | |
resolve merge conflicts of 0f35aeec67dc57395216272fe8905f13dd475747 to mainline-prod
Change-Id: If7d2d63979907e9658dc742a7af5a8056f9e54c6
| -rwxr-xr-x | java/app.go | 2 | ||||
| -rw-r--r-- | java/hiddenapi_singleton_test.go | 2 | ||||
| -rw-r--r-- | java/java.go | 19 |
3 files changed, 3 insertions, 20 deletions
diff --git a/java/app.go b/java/app.go index c9412c435..1099a0307 100755 --- a/java/app.go +++ b/java/app.go @@ -969,6 +969,8 @@ func (a *AndroidApp) OutputFiles(tag string) (android.Paths, error) { switch tag { case ".aapt.srcjar": return []android.Path{a.aaptSrcJar}, nil + case ".export-package.apk": + return []android.Path{a.exportPackage}, nil } return a.Library.OutputFiles(tag) } diff --git a/java/hiddenapi_singleton_test.go b/java/hiddenapi_singleton_test.go index c51fc8760..2010bc97a 100644 --- a/java/hiddenapi_singleton_test.go +++ b/java/hiddenapi_singleton_test.go @@ -215,5 +215,5 @@ func generateSdkDexPath(module string, unbundled bool) string { if unbundled { return generateDexedPath("prebuilts/sdk/"+module, "dex", module) } - return generateDexedPath(module, "dex-withres", module) + return generateDexPath(module) } diff --git a/java/java.go b/java/java.go index f0701184e..18def0b18 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"} @@ -662,12 +661,6 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) { j.linter.deps(ctx) sdkDeps(ctx, sdkContext(j), j.dexer) - - 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()) @@ -1016,18 +1009,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: |