summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2018-10-04 15:21:03 -0700
committerColin Cross <ccross@android.com>2018-10-08 15:25:54 -0700
commitbd01e2abee24a1567438f66602bec4309da85bde (patch)
tree84cbecf203a80c0ccdf2b513d491f5f53da089af /java/java.go
parenta4f08813a34418a07aa0ebd8b3e704f3a82081ef (diff)
Add support for android_app_certificate modules
Some android_app modules need certificates located outside their directory. Instead of requiring paths from the root of the tree, add an android_app_certificate module that exports the certificate files. Test: m checkbuild Change-Id: Icbf3898894f3eb857e2d907e3e58dd072c6fabe9
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go7
1 files changed, 6 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go
index 7ef3626d6..c5414f4fa 100644
--- a/java/java.go
+++ b/java/java.go
@@ -377,6 +377,7 @@ var (
frameworkApkTag = dependencyTag{name: "framework-apk"}
kotlinStdlibTag = dependencyTag{name: "kotlin-stdlib"}
proguardRaiseTag = dependencyTag{name: "proguard-raise"}
+ certificateTag = dependencyTag{name: "certificate"}
)
type sdkDep struct {
@@ -797,7 +798,11 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps {
tag := ctx.OtherModuleDependencyTag(module)
if _, ok := tag.(*jniDependencyTag); ok {
- // Handled by AndroidApp.collectJniDeps
+ // Handled by AndroidApp.collectAppDeps
+ return
+ }
+ if tag == certificateTag {
+ // Handled by AndroidApp.collectAppDeps
return
}