aboutsummaryrefslogtreecommitdiffstats
path: root/java/app.go
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-09-18 17:41:52 -0700
committerColin Cross <ccross@android.com>2017-09-20 13:20:45 -0700
commitfc3674a607d246dff0f415f50e35f2e988ecf7bf (patch)
tree05f594880d517f6cefced10b393210b5e5b2a6d4 /java/app.go
parent2acdae88531f9f4b297c488ffbbc1b7419587f9f (diff)
downloadbuild_soong-fc3674a607d246dff0f415f50e35f2e988ecf7bf.tar.gz
build_soong-fc3674a607d246dff0f415f50e35f2e988ecf7bf.tar.bz2
build_soong-fc3674a607d246dff0f415f50e35f2e988ecf7bf.zip
Remove android_prebuilt_sdk modules
Forcing sdk modules to be declared explicitly is unnecessary, just add the required dependencies on the jar and aidl files. Test: java_test.go Change-Id: Ib28bdc1051c5825e7c0efb6adff1f9282675560e
Diffstat (limited to 'java/app.go')
-rw-r--r--java/app.go4
1 files changed, 1 insertions, 3 deletions
diff --git a/java/app.go b/java/app.go
index e6b91a73..80d62fda 100644
--- a/java/app.go
+++ b/java/app.go
@@ -233,9 +233,7 @@ func (a *AndroidApp) aaptFlags(ctx android.ModuleContext) ([]string, android.Pat
ctx.VisitDirectDeps(func(module blueprint.Module) {
var depFiles android.Paths
- if sdkDep, ok := module.(sdkDependency); ok {
- depFiles = sdkDep.ClasspathFiles()
- } else if javaDep, ok := module.(Dependency); ok {
+ if javaDep, ok := module.(Dependency); ok {
if ctx.OtherModuleName(module) == "framework-res" {
depFiles = android.Paths{javaDep.(*AndroidApp).exportPackage}
}