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

Commit 2051d1fc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "installd: pass verification state from odsign to ART tools" into sc-dev am: 9345fd4c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15175854

Change-Id: If8a94428e1997d3f24cf6fce847358bc40aea5aa
parents ddad8baa 9345fd4c

cmds/installd/dexopt.cpp

+16 −0
Original line number Diff line number Diff line
@@ -492,6 +492,14 @@ class RunProfman : public ExecVHelper { 
                 std::to_string(min_new_methods_percent_change));

        }



        // On-device signing related. odsign sets the system property odsign.verification.success if

        // AOT artifacts have the expected signatures.

        const bool trust_art_apex_data_files =

                ::android::base::GetBoolProperty("odsign.verification.success", false);

        if (!trust_art_apex_data_files) {

            AddRuntimeArg("-Xdeny-art-apex-data-files");

        }



        // Do not add after dex2oat_flags, they should override others for debugging.

        PrepareArgs(profman_bin);

    }
@@ -1231,6 +1239,14 @@ class RunDexoptAnalyzer : public ExecVHelper { 
            }

        }



        // On-device signing related. odsign sets the system property odsign.verification.success if

        // AOT artifacts have the expected signatures.

        const bool trust_art_apex_data_files =

                ::android::base::GetBoolProperty("odsign.verification.success", false);

        if (!trust_art_apex_data_files) {

            AddRuntimeArg("-Xdeny-art-apex-data-files");

        }



        PrepareArgs(dexoptanalyzer_bin);

    }

cmds/installd/run_dex2oat.cpp

+7 −0
Original line number Diff line number Diff line
@@ -283,6 +283,13 @@ void RunDex2Oat::PrepareCompilerConfigFlags(const UniqueFile& input_vdex, 
        }

    }



    // On-device signing related. odsign sets the system property odsign.verification.success if

    // AOT artifacts have the expected signatures.

    const bool trust_art_apex_data_files = GetBoolProperty("odsign.verification.success", false);

    if (!trust_art_apex_data_files) {

        AddRuntimeArg("-Xdeny-art-apex-data-files");

    }



    if (target_sdk_version != 0) {

        AddRuntimeArg(StringPrintf("-Xtarget-sdk-version:%d", target_sdk_version));

    }