Merge "[view compilation] Add separate compilation property"

am: 9343b88b43

Change-Id: I2944873c615c6278507a39a78a5c0dec2f4104df
This commit is contained in:
Mathieu Chartier
2019-01-25 14:05:20 -08:00
committed by android-build-merger

View File

@@ -450,8 +450,7 @@ public class PackageManagerService extends IPackageManager.Stub
private static final boolean ENABLE_FREE_CACHE_V2 = private static final boolean ENABLE_FREE_CACHE_V2 =
SystemProperties.getBoolean("fw.free_cache_v2", true); SystemProperties.getBoolean("fw.free_cache_v2", true);
private static final boolean PRECOMPILED_LAYOUT_ENABLED = private static final String PRECOMPILE_LAYOUTS = "pm.precompile_layouts";
SystemProperties.getBoolean("view.precompiled_layout_enabled", false);
private static final int RADIO_UID = Process.PHONE_UID; private static final int RADIO_UID = Process.PHONE_UID;
private static final int LOG_UID = Process.LOG_UID; private static final int LOG_UID = Process.LOG_UID;
@@ -9180,7 +9179,7 @@ public class PackageManagerService extends IPackageManager.Stub
pkgCompilationReason = PackageManagerService.REASON_BACKGROUND_DEXOPT; pkgCompilationReason = PackageManagerService.REASON_BACKGROUND_DEXOPT;
} }
if (PRECOMPILED_LAYOUT_ENABLED) { if (SystemProperties.getBoolean(PRECOMPILE_LAYOUTS, false)) {
mArtManagerService.compileLayouts(pkg); mArtManagerService.compileLayouts(pkg);
} }
@@ -17747,7 +17746,7 @@ public class PackageManagerService extends IPackageManager.Stub
if (performDexopt) { if (performDexopt) {
// Compile the layout resources. // Compile the layout resources.
if (PRECOMPILED_LAYOUT_ENABLED) { if (SystemProperties.getBoolean(PRECOMPILE_LAYOUTS, false)) {
Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "compileLayouts"); Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "compileLayouts");
mArtManagerService.compileLayouts(pkg); mArtManagerService.compileLayouts(pkg);
Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);