Merge "Change the naming policy of system_$(VER)" am: 7a26b708a5 am: 8b6f140b5c

am: 38a6797919 Change-Id: I02ce1e4938a87709ed6970f85749c1552282236b
2018-02-07 09:02:00 +00:00
parent 5486f555a1 38a6797919
commit 7c62ddc381
1 changed files with 0 additions and 6 deletions
--- a/java/java.go
+++ b/java/java.go
@@ -375,12 +375,6 @@ func decodeSdkDep(ctx android.BaseContext, v string) sdkDep {
 		aidlPath := android.ExistentPathForSource(ctx, "sdkdir", aidl)

 		if (!jarPath.Valid() || !aidlPath.Valid()) && ctx.Config().AllowMissingDependencies() {
-			if strings.Contains(v, "system_") {
-				return sdkDep{
-					invalidVersion: true,
-					module:         "system_sdk_v" + strings.Replace(v, "system_", "", 1),
-				}
-			}
 			return sdkDep{
 				invalidVersion: true,
 				module:         "sdk_v" + v,