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

Commit 94ed211d authored by Vladimir Marko's avatar Vladimir Marko Committed by android-build-merger
Browse files

Merge "Remove PIC option from oat files." am: 7f72e506 am: 587a080e 

am: cf5e2a1c

Change-Id: Ibab6eb54f7de8f6db3be320d374fd8cd992724e1
parents 9bb41b0f cf5e2a1c

cmds/installd/dexopt.cpp

+2 −5
Original line number Original line Diff line number Diff line
@@ -1692,15 +1692,12 @@ static bool process_secondary_dexoptanalyzer_result(const std::string& dex_path, 
            *dexopt_needed_out = NO_DEXOPT_NEEDED; return true;

            *dexopt_needed_out = NO_DEXOPT_NEEDED; return true;

        case 1:  // dexoptanalyzer: dex2oat_from_scratch

        case 1:  // dexoptanalyzer: dex2oat_from_scratch

            *dexopt_needed_out = DEX2OAT_FROM_SCRATCH; return true;

            *dexopt_needed_out = DEX2OAT_FROM_SCRATCH; return true;

        case 5:  // dexoptanalyzer: dex2oat_for_bootimage_odex

        case 4:  // dexoptanalyzer: dex2oat_for_bootimage_odex

            *dexopt_needed_out = -DEX2OAT_FOR_BOOT_IMAGE; return true;

            *dexopt_needed_out = -DEX2OAT_FOR_BOOT_IMAGE; return true;

        case 6:  // dexoptanalyzer: dex2oat_for_filter_odex

        case 5:  // dexoptanalyzer: dex2oat_for_filter_odex

            *dexopt_needed_out = -DEX2OAT_FOR_FILTER; return true;

            *dexopt_needed_out = -DEX2OAT_FOR_FILTER; return true;

        case 7:  // dexoptanalyzer: dex2oat_for_relocation_odex

            *dexopt_needed_out = -DEX2OAT_FOR_RELOCATION; return true;

        case 2:  // dexoptanalyzer: dex2oat_for_bootimage_oat

        case 2:  // dexoptanalyzer: dex2oat_for_bootimage_oat

        case 3:  // dexoptanalyzer: dex2oat_for_filter_oat

        case 3:  // dexoptanalyzer: dex2oat_for_filter_oat

        case 4:  // dexoptanalyzer: dex2oat_for_relocation_oat

            *error_msg = StringPrintf("Dexoptanalyzer return the status of an oat file."

            *error_msg = StringPrintf("Dexoptanalyzer return the status of an oat file."

                                      " Expected odex file status for secondary dex %s"

                                      " Expected odex file status for secondary dex %s"

                                      " : dexoptanalyzer result=%d",

                                      " : dexoptanalyzer result=%d",

cmds/installd/dexopt.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,6 @@ static constexpr int NO_DEXOPT_NEEDED = 0; 
static constexpr int DEX2OAT_FROM_SCRATCH        = 1;

static constexpr int DEX2OAT_FROM_SCRATCH        = 1;

static constexpr int DEX2OAT_FOR_BOOT_IMAGE      = 2;

static constexpr int DEX2OAT_FOR_BOOT_IMAGE      = 2;

static constexpr int DEX2OAT_FOR_FILTER          = 3;

static constexpr int DEX2OAT_FOR_FILTER          = 3;

static constexpr int DEX2OAT_FOR_RELOCATION      = 4;





// Clear the reference profile identified by the given profile name.

// Clear the reference profile identified by the given profile name.

bool clear_primary_reference_profile(const std::string& pkgname, const std::string& profile_name);

bool clear_primary_reference_profile(const std::string& pkgname, const std::string& profile_name);