StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove special-cased stub deps on framework-res" am: 85f59b7b54 am: ac3addb71b am: f05025fc83

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1398475

Change-Id: I4d84b1232fedb6507aa3f4a1d391e68a18e75279
This commit is contained in:
Anton Hansson
2020-08-18 12:37:43 +00:00
committed by Automerger Merge Worker
parent 610adb9309 f05025fc83
commit 85ccb136d1
1 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
java/java.go
View File

@@ -556,7 +556,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"}
@@ -697,12 +696,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())
@@ -1052,18 +1045,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: