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

Changed droiddoc.go to compile Metalava based android.jar

Browse Source 
Test: m -j metalava_android_stubs_current
Bug: b/78245848
Change-Id: Ibce139a93a40e412d8def1b26660446b0a7a24ff
This commit is contained in:
Nan Zhang
2018-06-13 17:42:48 -07:00
parent 4038a6ea9f
commit 16c0a31b18
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
java/java.go
View File

@@ -507,7 +507,10 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) {
}
if ctx.ModuleName() == "android_stubs_current" ||
ctx.ModuleName() == "android_system_stubs_current" ||
ctx.ModuleName() == "android_test_stubs_current" {
ctx.ModuleName() == "android_test_stubs_current" ||
ctx.ModuleName() == "metalava_android_stubs_current" ||
ctx.ModuleName() == "metalava_android_system_stubs_current" ||
ctx.ModuleName() == "metalava_android_test_stubs_current" {
ctx.AddDependency(ctx.Module(), frameworkApkTag, "framework-res")
}
}
@@ -628,13 +631,13 @@ func getLinkType(m *Module, name string) linkType {
ver := String(m.deviceProperties.Sdk_version)
noStdLibs := Bool(m.properties.No_standard_libs)
switch {
case name == "core.current.stubs" || ver == "core_current" || noStdLibs:
case name == "core.current.stubs" || ver == "core_current" || noStdLibs || name == "stub-annotations":
return javaCore
case name == "android_system_stubs_current" || strings.HasPrefix(ver, "system_"):
case name == "android_system_stubs_current" || strings.HasPrefix(ver, "system_") || name == "metalava_android_system_stubs_current":
return javaSystem
case name == "android_test_stubs_current" || strings.HasPrefix(ver, "test_"):
case name == "android_test_stubs_current" || strings.HasPrefix(ver, "test_") || name == "metalava_android_test_stubs_current":
return javaPlatform
case name == "android_stubs_current" || ver == "current":
case name == "android_stubs_current" || ver == "current" || name == "metalava_android_stubs_current":
return javaSdk
case ver == "":
return javaPlatform
@@ -724,7 +727,10 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps {
case frameworkApkTag:
if ctx.ModuleName() == "android_stubs_current" ||
ctx.ModuleName() == "android_system_stubs_current" ||
ctx.ModuleName() == "android_test_stubs_current" {
ctx.ModuleName() == "android_test_stubs_current" ||
ctx.ModuleName() == "metalava_android_stubs_current" ||
ctx.ModuleName() == "metalava_android_system_stubs_current" ||
ctx.ModuleName() == "metalava_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.
//