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
diff --git a/java/app.go b/java/app.go
index e6b91a7..80d62fd 100644
--- a/java/app.go
+++ b/java/app.go
@@ -233,9 +233,7 @@
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}
}