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

Commit 2d5a1bc0 authored by Mathieu Chartier's avatar Mathieu Chartier
Browse files

Pass in new flag DEXOPT_GENERATE_APP_IMAGE to test cases 

Test cases that expect an app image pass this flag down.

Bug: 72696798
Test: adb shell /data/nativetest64/installd_dexopt_test/installd_dexopt_test

(cherry picked from commit 4f1ad408)

Merged-In: I2845488bf3c3012d67120503219400cfcf7da716
Change-Id: I6fe947c7b6a5b47b06b484edc8ea69a366496931
parent 1dc3dfaf

cmds/installd/tests/installd_dexopt_test.cpp

+5 −3
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ TEST_F(DexoptTest, DexoptPrimaryFailedInvalidFilter) { 
TEST_F(DexoptTest, DexoptPrimaryProfileNonPublic) {

    LOG(INFO) << "DexoptPrimaryProfileNonPublic";

    CompilePrimaryDexOk("speed-profile",

                        DEXOPT_BOOTCOMPLETE | DEXOPT_PROFILE_GUIDED,

                        DEXOPT_BOOTCOMPLETE | DEXOPT_PROFILE_GUIDED | DEXOPT_GENERATE_APP_IMAGE,

                        app_oat_dir_.c_str(),

                        kTestAppGid,

                        DEX2OAT_FROM_SCRATCH);
@@ -555,7 +555,8 @@ TEST_F(DexoptTest, DexoptPrimaryProfileNonPublic) { 
TEST_F(DexoptTest, DexoptPrimaryProfilePublic) {

    LOG(INFO) << "DexoptPrimaryProfilePublic";

    CompilePrimaryDexOk("speed-profile",

                        DEXOPT_BOOTCOMPLETE | DEXOPT_PROFILE_GUIDED | DEXOPT_PUBLIC,

                        DEXOPT_BOOTCOMPLETE | DEXOPT_PROFILE_GUIDED | DEXOPT_PUBLIC |

                                DEXOPT_GENERATE_APP_IMAGE,

                        app_oat_dir_.c_str(),

                        kTestAppGid,

                        DEX2OAT_FROM_SCRATCH);
@@ -564,7 +565,8 @@ TEST_F(DexoptTest, DexoptPrimaryProfilePublic) { 
TEST_F(DexoptTest, DexoptPrimaryBackgroundOk) {

    LOG(INFO) << "DexoptPrimaryBackgroundOk";

    CompilePrimaryDexOk("speed-profile",

                        DEXOPT_IDLE_BACKGROUND_JOB | DEXOPT_PROFILE_GUIDED,

                        DEXOPT_IDLE_BACKGROUND_JOB | DEXOPT_PROFILE_GUIDED |

                                DEXOPT_GENERATE_APP_IMAGE,

                        app_oat_dir_.c_str(),

                        kTestAppGid,

                        DEX2OAT_FROM_SCRATCH);