tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes from topic "may27-sdk" into sc-dev

Browse source 
* changes:
  Hacky workaround for half-finalized builds.
  platform/build/soong - S is now 31
This commit is contained in:
Jeff Sharkey 2021-06-02 20:11:14 +00:00 committed by Android (Google) Code Review
commit 799822d7af
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/api_levels.go
View file

@ -289,6 +289,7 @@ func getFinalCodenamesMap(config Config) map[string]int {
"P": 28,
"Q": 29,
"R": 30,
"S": 31,
}
// TODO: Differentiate "current" and "future".
@ -331,6 +332,7 @@ func getApiLevelsMap(config Config) map[string]int {
"P": 28,
"Q": 29,
"R": 30,
"S": 31,
}
for i, codename := range config.PlatformVersionActiveCodenames() {
apiLevelsMap[codename] = previewAPILevelBase + i

3
java/droidstubs.go
View file

@ -363,7 +363,8 @@ func (d *Droidstubs) apiLevelsAnnotationsFlags(ctx android.ModuleContext, cmd *a
cmd.FlagWithOutput("--generate-api-levels ", d.apiVersionsXml)
cmd.FlagWithInput("--apply-api-levels ", d.apiVersionsXml)
cmd.FlagWithArg("--current-version ", ctx.Config().PlatformSdkVersion().String())
cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename())
// STOPSHIP: RESTORE THIS LOGIC WHEN DECLARING "REL" BUILD
// cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename())
filename := proptools.StringDefault(d.properties.Api_levels_jar_filename, "android.jar")