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

Commit 1752a113 authored by Vladimir Marko's avatar Vladimir Marko
Browse files

Remove PIC option from oat files. 

Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: Pixel 2 XL boots.
Test: m test-art-target-gtest
Test: testrunner.py --target --optimizing
Bug: 77856493
Change-Id: I8201c5f6a3238f39d2c857a44abcb228dcbbbb7a
parent 2a1310d0

cmds/installd/dexopt.cpp

+2 −5
Original line number 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;

        case 1:  // dexoptanalyzer: dex2oat_from_scratch

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

        case 6:  // dexoptanalyzer: dex2oat_for_filter_odex

        case 5:  // dexoptanalyzer: dex2oat_for_filter_odex

            *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 3:  // dexoptanalyzer: dex2oat_for_filter_oat

        case 4:  // dexoptanalyzer: dex2oat_for_relocation_oat

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

                                      " Expected odex file status for secondary dex %s"

                                      " : dexoptanalyzer result=%d",

cmds/installd/dexopt.h

+0 −1
Original line number 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_FOR_BOOT_IMAGE      = 2;

static constexpr int DEX2OAT_FOR_FILTER          = 3;

static constexpr int DEX2OAT_FOR_RELOCATION      = 4;



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

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