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
diff --git a/java/java.go b/java/java.go
index 8312ecc..955b720 100644
--- a/java/java.go
+++ b/java/java.go
@@ -375,12 +375,6 @@
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,