Skip to content

Commit

Permalink
Change the naming policy of system_$(VER)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Sundong Ahn committed Feb 6, 2018
1 parent deda6ef commit 8222d3b
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions java/java.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 8222d3b

Please sign in to comment.