openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Remove special-cased stub deps on framework-res" into rvc-dev am: 0f35aeec67 am: 81768cc9cc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12849659

Change-Id: I26c9f5f44f9e503fc757e89098fd020d932b6b0f
This commit is contained in:
Liz Kammer 2020-10-16 18:31:35 +00:00 committed by Automerger Merge Worker
parent 8667afc95c 81768cc9cc
commit 3098adf57f
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
java/java.go
View File

@ -578,7 +578,6 @@ var (
bootClasspathTag = dependencyTag{name: "bootclasspath"} bootClasspathTag = dependencyTag{name: "bootclasspath"}
systemModulesTag = dependencyTag{name: "system modules"} systemModulesTag = dependencyTag{name: "system modules"}
frameworkResTag = dependencyTag{name: "framework-res"} frameworkResTag = dependencyTag{name: "framework-res"}
frameworkApkTag = dependencyTag{name: "framework-apk"}
kotlinStdlibTag = dependencyTag{name: "kotlin-stdlib"} kotlinStdlibTag = dependencyTag{name: "kotlin-stdlib"}
kotlinAnnotationsTag = dependencyTag{name: "kotlin-annotations"} kotlinAnnotationsTag = dependencyTag{name: "kotlin-annotations"}
proguardRaiseTag = dependencyTag{name: "proguard-raise"} proguardRaiseTag = dependencyTag{name: "proguard-raise"}
@ -703,12 +702,6 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) {
if sdkDep.systemModules != "" { if sdkDep.systemModules != "" {
ctx.AddVariationDependencies(nil, systemModulesTag, 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()) syspropPublicStubs := syspropPublicStubs(ctx.Config())
@ -1057,18 +1050,6 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps {
} else { } else {
ctx.PropertyErrorf("exported_plugins", "%q is not a java_plugin module", otherName) 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: case kotlinStdlibTag:
deps.kotlinStdlib = append(deps.kotlinStdlib, dep.HeaderJars()...) deps.kotlinStdlib = append(deps.kotlinStdlib, dep.HeaderJars()...)
case kotlinAnnotationsTag: case kotlinAnnotationsTag: