Merge "Create scripts to update and freeze a module SDK"

2019-10-17 01:02:16 +00:00
parent 344eed4eb1 9b409bcd10
commit d7d5e5a1ac
6 changed files with 329 additions and 37 deletions
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -145,7 +145,7 @@ func (j *TestHelperLibrary) AndroidMkEntries() android.AndroidMkEntries {
 }

 func (prebuilt *Import) AndroidMkEntries() android.AndroidMkEntries {
-	if !prebuilt.IsForPlatform() || !prebuilt.ContainingSdk().IsCurrentVersion() {
+	if !prebuilt.IsForPlatform() || !prebuilt.ContainingSdk().Unversioned() {
 		return android.AndroidMkEntries{
 			Disabled: true,
 		}