commit 2d5a1bc0994425e31271fa3dd20975702d4c3afc
author Mathieu Chartier <mathieuc@google.com> Tue Apr 03 14:55:43 2018 -0700
committer Mathieu Chartier <mathieuc@google.com> Tue Apr 03 15:39:07 2018 -0700
tree db8940e286a7de4c410259f8b8daeb52f3cee53a
parent 1dc3dfaf8dbb5160062aaa1b0129ef9fe628a70d

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 4f1ad408b8b830e2b8dc852f65031e504b036a36)

Merged-In: I2845488bf3c3012d67120503219400cfcf7da716
Change-Id: I6fe947c7b6a5b47b06b484edc8ea69a366496931

cmds/installd/tests/installd_dexopt_test.cpp

diff --git a/cmds/installd/tests/installd_dexopt_test.cpp b/cmds/installd/tests/installd_dexopt_test.cpp
index 668e604..279bce8 100644
--- a/cmds/installd/tests/installd_dexopt_test.cpp
+++ b/cmds/installd/tests/installd_dexopt_test.cpp
@@ -546,7 +546,7 @@
 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, 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, 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);