Merge "Reland^2 "m <apex_name>-deps-info prints the internal/external deps of the APEX""
diff --git a/java/app.go b/java/app.go
index 05fa505..a6b3408 100755
--- a/java/app.go
+++ b/java/app.go
@@ -752,6 +752,7 @@
android.InitAndroidMultiTargetsArchModule(module, android.DeviceSupported, android.MultilibCommon)
android.InitDefaultableModule(module)
+ android.InitApexModule(module)
return module
}
diff --git a/java/java.go b/java/java.go
index 5afdc2f..4c6a5a5 100644
--- a/java/java.go
+++ b/java/java.go
@@ -627,12 +627,9 @@
}
linkType, _ := j.getLinkType(ctx.ModuleName())
- if linkType == javaSystem {
+ // only platform modules can use internal props
+ if linkType != javaPlatform {
ret[idx] = stub
- } else if linkType != javaPlatform {
- ctx.PropertyErrorf("sdk_version",
- "can't link against sysprop_library %q from a module using public or core API",
- lib)
}
}