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

Commit e048f8bc authored by Mathieu Chartier's avatar Mathieu Chartier Committed by Gerrit Code Review
Browse files

Merge changes from topic "app-image-flag" 

* changes:
  Pass in new flag DEXOPT_GENERATE_APP_IMAGE to test cases
  Add flag for controling app image generation
parents 469e9925 2d5a1bc0

cmds/installd/dexopt.cpp

+10 −9
Original line number Diff line number Diff line
@@ -1264,8 +1264,8 @@ class Dex2oatFileWrapper { 
};



// (re)Creates the app image if needed.

Dex2oatFileWrapper maybe_open_app_image(const char* out_oat_path, bool profile_guided,

        bool is_public, int uid, bool is_secondary_dex) {

Dex2oatFileWrapper maybe_open_app_image(const char* out_oat_path,

        bool generate_app_image, bool is_public, int uid, bool is_secondary_dex) {



    // We don't create an image for secondary dex files.

    if (is_secondary_dex) {
@@ -1278,11 +1278,11 @@ Dex2oatFileWrapper maybe_open_app_image(const char* out_oat_path, bool profile_g 
        return Dex2oatFileWrapper();

    }



    // Use app images only if it is enabled (by a set image format) and we are compiling

    // profile-guided (so the app image doesn't conservatively contain all classes).

    if (!profile_guided) {

    // In case there is a stale image, remove it now. Ignore any error.

    unlink(image_path.c_str());



    // Not enabled, exit.

    if (!generate_app_image) {

        return Dex2oatFileWrapper();

    }

    char app_image_format[kPropertyValueMax];
@@ -1959,6 +1959,7 @@ int dexopt(const char* dex_path, uid_t uid, const char* pkgname, const char* ins 
    bool background_job_compile = (dexopt_flags & DEXOPT_IDLE_BACKGROUND_JOB) != 0;

    bool enable_hidden_api_checks = (dexopt_flags & DEXOPT_ENABLE_HIDDEN_API_CHECKS) != 0;

    bool generate_compact_dex = (dexopt_flags & DEXOPT_GENERATE_COMPACT_DEX) != 0;

    bool generate_app_image = (dexopt_flags & DEXOPT_GENERATE_APP_IMAGE) != 0;



    // Check if we're dealing with a secondary dex file and if we need to compile it.

    std::string oat_dir_str;
@@ -2027,8 +2028,8 @@ int dexopt(const char* dex_path, uid_t uid, const char* pkgname, const char* ins 
    unique_fd swap_fd = maybe_open_dexopt_swap_file(out_oat_path);



    // Create the app image file if needed.

    Dex2oatFileWrapper image_fd =

            maybe_open_app_image(out_oat_path, profile_guided, is_public, uid, is_secondary_dex);

    Dex2oatFileWrapper image_fd = maybe_open_app_image(

            out_oat_path, generate_app_image, is_public, uid, is_secondary_dex);



    // Open the reference profile if needed.

    Dex2oatFileWrapper reference_profile_fd = maybe_open_reference_profile(

cmds/installd/installd_constants.h

+3 −1
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ constexpr int DEXOPT_STORAGE_DE = 1 << 8; 
constexpr int DEXOPT_IDLE_BACKGROUND_JOB = 1 << 9;

constexpr int DEXOPT_ENABLE_HIDDEN_API_CHECKS = 1 << 10;

constexpr int DEXOPT_GENERATE_COMPACT_DEX = 1 << 11;

constexpr int DEXOPT_GENERATE_APP_IMAGE = 1 << 12;



/* all known values for dexopt flags */

constexpr int DEXOPT_MASK =
@@ -67,7 +68,8 @@ constexpr int DEXOPT_MASK = 
    | DEXOPT_STORAGE_DE

    | DEXOPT_IDLE_BACKGROUND_JOB

    | DEXOPT_ENABLE_HIDDEN_API_CHECKS

    | DEXOPT_GENERATE_COMPACT_DEX;

    | DEXOPT_GENERATE_COMPACT_DEX

    | DEXOPT_GENERATE_APP_IMAGE;



// NOTE: keep in sync with StorageManager

constexpr int FLAG_STORAGE_DE = 1 << 0;

cmds/installd/otapreopt.cpp

+2 −1
Original line number Diff line number Diff line
@@ -82,8 +82,9 @@ static_assert(DEXOPT_STORAGE_DE == 1 << 8, "DEXOPT_STORAGE_DE unexpected."); 
static_assert(DEXOPT_ENABLE_HIDDEN_API_CHECKS == 1 << 10,

        "DEXOPT_ENABLE_HIDDEN_API_CHECKS unexpected");

static_assert(DEXOPT_GENERATE_COMPACT_DEX == 1 << 11, "DEXOPT_GENERATE_COMPACT_DEX unexpected");

static_assert(DEXOPT_GENERATE_APP_IMAGE == 1 << 12, "DEXOPT_GENERATE_APP_IMAGE unexpected");



static_assert(DEXOPT_MASK           == (0xdfe | DEXOPT_IDLE_BACKGROUND_JOB),

static_assert(DEXOPT_MASK           == (0x1dfe | DEXOPT_IDLE_BACKGROUND_JOB),

              "DEXOPT_MASK unexpected.");

cmds/installd/otapreopt_parameters.cpp

+2 −0
Original line number Diff line number Diff line
@@ -246,6 +246,8 @@ bool OTAPreoptParameters::ReadArgumentsPostV1(uint32_t version, const char** arg 
        case 7:

        // Version 8 adds a new dexopt flag: DEXOPT_GENERATE_COMPACT_DEX

        case 8: num_args_expected = 16; break;

        // Version 9 adds a new dexopt flag: DEXOPT_GENERATE_APP_IMAGE

        case 9: num_args_expected = 16; break;

        default:

            LOG(ERROR) << "Don't know how to read arguments for version " << version;

            return false;

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);