Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e538e704 authored by Narayan Kamath's avatar Narayan Kamath Committed by android-build-merger
Browse files

Merge "PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive" am: dc616ab1 am: cfb01b3f

am: 7dc51259

Change-Id: Ie72e549707b50d2b9b419e6fc2fbc82301ad3805
parents 476cd654 7dc51259
Loading
Loading
Loading
Loading
+10 −1
Original line number Diff line number Diff line
@@ -52,7 +52,16 @@ public class PackageManagerServiceCompilerMapping {
    // Load the property for the given reason and check for validity. This will throw an
    // exception in case the reason or value are invalid.
    private static String getAndCheckValidity(int reason) {
        String sysPropValue = SystemProperties.get(getSystemPropertyName(reason));
        String sysPropName = getSystemPropertyName(reason);
        String sysPropValue;
        // TODO: This is a temporary hack to keep marlin booting on aosp/master while we
        // figure out how to deal with these system properties that currently appear on
        // vendor.
        if ("pm.dexopt.inactive".equals(sysPropName)) {
            sysPropValue = "verify";
        } else {
            sysPropValue = SystemProperties.get(sysPropName);
        }
        if (sysPropValue == null || sysPropValue.isEmpty() ||
                !DexFile.isValidCompilerFilter(sysPropValue)) {
            throw new IllegalStateException("Value \"" + sysPropValue +"\" not valid "