From 8222d3b31e5d4b87861dbe096cc631bdf4272ddf Mon Sep 17 00:00:00 2001
From: Sundong Ahn <sundongahn@google.com>
Date: Thu, 1 Feb 2018 17:45:05 +0900
Subject: [PATCH] Change the naming policy of system_$(VER)

The module name of system_$(VER) prebuilt file is system_sdk_v$(VER).
But this is inconsistent with sdk_v$(LOCAL_SDK_VERSION) in
prebuilts/sdk.
So, system_sdk_v$(VER) is changed to sdk_vsystem_$(VER) to use the same
naming policy.

Bug: 72031391
Test: build
Change-Id: I3f18b7969dda208beeefdcaefadcc42db5c1577e
---
 java/java.go | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/java/java.go b/java/java.go
index 8312ecc6cc..955b720bbe 100644
--- 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,