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

Commit 54300ac8 authored by David Brazdil's avatar David Brazdil Committed by android-build-merger
Browse files

Merge "Revert^2: dexopt: Fix target-sdk-version argument creation" am: e9d502a4 am: 459934e5 

am: 4c9fe596

Change-Id: Ib7916f4ae5b8ab5a4991e26641a10c14d4b879bd
parents 2228071f 4c9fe596

cmds/installd/dexopt.cpp

+2 −2
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ class RunDex2Oat : public ExecVHelper { 
        std::string dex2oat_image_fd;

        std::string target_sdk_version_arg;

        if (target_sdk_version != 0) {

            StringPrintf("-Xtarget-sdk-version:%d", target_sdk_version);

            target_sdk_version_arg = StringPrintf("-Xtarget-sdk-version:%d", target_sdk_version);

        }

        std::string class_loader_context_arg;

        if (class_loader_context != nullptr) {
@@ -471,7 +471,7 @@ class RunDex2Oat : public ExecVHelper { 
        if (disable_cdex) {

            AddArg(kDisableCompactDexFlag);

        }

        AddArg(target_sdk_version_arg);

        AddRuntimeArg(target_sdk_version_arg);

        if (enable_hidden_api_checks) {

            AddRuntimeArg("-Xhidden-api-checks");

        }