diff options
| -rw-r--r-- | android/config.go | 3 | ||||
| -rw-r--r-- | android/updatable_modules.go | 2 | ||||
| -rw-r--r-- | java/aapt2.go | 3 | ||||
| -rw-r--r-- | java/aar.go | 2 | ||||
| -rw-r--r-- | mk2rbc/test/version_defaults.mk.test | 4 |
5 files changed, 10 insertions, 4 deletions
diff --git a/android/config.go b/android/config.go index 72ff2247a..6f76ac5d1 100644 --- a/android/config.go +++ b/android/config.go @@ -619,9 +619,12 @@ func NewConfig(cmdArgs CmdArgs, availableEnv map[string]string) (Config, error) "framework-adservices": {}, "framework-appsearch": {}, "framework-bluetooth": {}, + "framework-configinfrastructure": {}, "framework-connectivity": {}, "framework-connectivity-t": {}, + "framework-devicelock": {}, "framework-graphics": {}, + "framework-healthfitness": {}, "framework-media": {}, "framework-mediaprovider": {}, "framework-ondevicepersonalization": {}, diff --git a/android/updatable_modules.go b/android/updatable_modules.go index 6d0eeb716..1548170f9 100644 --- a/android/updatable_modules.go +++ b/android/updatable_modules.go @@ -33,4 +33,4 @@ package android // * AOSP - xx9990000 // * x-mainline-prod - xx9990000 // * master - 990090000 -const DefaultUpdatableModuleVersion = "340090000" +const DefaultUpdatableModuleVersion = "990090000" diff --git a/java/aapt2.go b/java/aapt2.go index 4cff8a720..9bebeb8e7 100644 --- a/java/aapt2.go +++ b/java/aapt2.go @@ -257,7 +257,8 @@ func aapt2Link(ctx android.ModuleContext, var aapt2ConvertRule = pctx.AndroidStaticRule("aapt2Convert", blueprint.RuleParams{ - Command: `${config.Aapt2Cmd} convert --output-format $format $in -o $out`, + Command: `${config.Aapt2Cmd} convert --enable-compact-entries ` + + `--output-format $format $in -o $out`, CommandDeps: []string{"${config.Aapt2Cmd}"}, }, "format", ) diff --git a/java/aar.go b/java/aar.go index 180e1d726..21e25e97a 100644 --- a/java/aar.go +++ b/java/aar.go @@ -191,6 +191,8 @@ func (a *aapt) aapt2Flags(ctx android.ModuleContext, sdkContext android.SdkConte // Flags specified in Android.bp linkFlags = append(linkFlags, a.aaptProperties.Aaptflags...) + linkFlags = append(linkFlags, "--enable-compact-entries") + // Find implicit or explicit asset and resource dirs assetDirs := android.PathsWithOptionalDefaultForModuleSrc(ctx, a.aaptProperties.Asset_dirs, "assets") resourceDirs := android.PathsWithOptionalDefaultForModuleSrc(ctx, a.aaptProperties.Resource_dirs, "res") diff --git a/mk2rbc/test/version_defaults.mk.test b/mk2rbc/test/version_defaults.mk.test index 166639278..3ce60bcdb 100644 --- a/mk2rbc/test/version_defaults.mk.test +++ b/mk2rbc/test/version_defaults.mk.test @@ -3,8 +3,8 @@ ifdef INTERNAL_BUILD_ID_MAKEFILE include $(INTERNAL_BUILD_ID_MAKEFILE) endif -DEFAULT_PLATFORM_VERSION := TP1A -.KATI_READONLY := DEFAULT_PLATFORM_VERSION +RELEASE_PLATFORM_VERSION := TP1A +.KATI_READONLY := RELEASE_PLATFORM_VERSION MIN_PLATFORM_VERSION := TP1A MAX_PLATFORM_VERSION := TP1A PLATFORM_VERSION_LAST_STABLE := 12 |