diff options
| author | 2018-06-18 16:55:28 +0000 | |
|---|---|---|
| committer | 2018-06-18 16:55:28 +0000 | |
| commit | f89db951e50ce18f5571d879865470795ec6d5e4 (patch) | |
| tree | 1f7eda11d1a318d1a6cd69a4d8780d70df98c404 /java/java.go | |
| parent | bbabc7b67e7d8f23b70278292d61f82f88fea428 (diff) | |
| parent | 16c0a31b188f0e36dc0687504bce740a69ec11c9 (diff) | |
Merge "Changed droiddoc.go to compile Metalava based android.jar"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/java/java.go b/java/java.go index 1fefcabeb..00ee5319b 100644 --- a/java/java.go +++ b/java/java.go @@ -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. // |