Просмотр исходного кода

Revert "Enable R8 full mode by default for apps"

This reverts commit 93d0bffafeac5a9c96b5921d5c48d3d78594e68b.

Reason for revert: Possible culprit for b/289285719

Change-Id: If818db9d38008ea9d8c7813b9f6fabc2975e8507
Kenneth Ford 11 месяцев назад
Родитель
Сommit
ba283992ef
2 измененных файлов с 2 добавлено и 3 удалено
  1. 0 1
      java/app.go
  2. 2 2
      java/dex.go

+ 0 - 1
java/app.go

@@ -1030,7 +1030,6 @@ func AndroidAppFactory() android.Module {
 
 	module.Module.dexProperties.Optimize.EnabledByDefault = true
 	module.Module.dexProperties.Optimize.Shrink = proptools.BoolPtr(true)
-	module.Module.dexProperties.Optimize.Proguard_compatibility = proptools.BoolPtr(false)
 
 	module.Module.properties.Instrument = true
 	module.Module.properties.Supports_static_instrumentation = true

+ 2 - 2
java/dex.go

@@ -45,8 +45,8 @@ type DexProperties struct {
 		// Whether to continue building even if warnings are emitted.  Defaults to true.
 		Ignore_warnings *bool
 
-		// If true, runs R8 in Proguard compatibility mode, otherwise runs R8 in full mode.
-		// Defaults to false for apps, true for libraries and tests.
+		// If true, runs R8 in Proguard compatibility mode (default).
+		// Otherwise, runs R8 in full mode.
 		Proguard_compatibility *bool
 
 		// If true, optimize for size by removing unused code.  Defaults to true for apps,