Merge "Change the naming policy of system_$(VER)"

am: 7a26b708a5 Change-Id: I5af4e7b2e20a18fa2e397bd91d17eb82d0231894
2018-02-07 06:32:58 +00:00
parent 9787126b17 7a26b708a5
commit 8b6f140b5c
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,