Merge "Change the naming policy of system_$(VER)"
This commit is contained in:
@@ -375,12 +375,6 @@ func decodeSdkDep(ctx android.BaseContext, v string) sdkDep {
|
|||||||
aidlPath := android.ExistentPathForSource(ctx, "sdkdir", aidl)
|
aidlPath := android.ExistentPathForSource(ctx, "sdkdir", aidl)
|
||||||
|
|
||||||
if (!jarPath.Valid() || !aidlPath.Valid()) && ctx.Config().AllowMissingDependencies() {
|
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{
|
return sdkDep{
|
||||||
invalidVersion: true,
|
invalidVersion: true,
|
||||||
module: "sdk_v" + v,
|
module: "sdk_v" + v,
|
||||||
|
Reference in New Issue
Block a user