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

Commit 5d6a8455 authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Merge changes Ie795897d,I86e1cfed,I840ecbca am: 1636f41a am: c77adfad 

am: e31c1e0a

Change-Id: I0a01a5f9662843822823708783645256ac4e0042
parents 123a045f e31c1e0a

cmds/installd/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ cc_defaults { 
        "-Wall",

        "-Werror",

        "-Wextra",



        "-Wunreachable-code",

        "-Wunreachable-code-break",

        "-Wunreachable-code-return",

    ],

    srcs: [

        "CacheItem.cpp",
@@ -15,6 +19,9 @@ cc_defaults { 
        "utils.cpp",

        ":installd_aidl",

    ],

    header_libs: [

        "dex2oat_headers",

    ],

    shared_libs: [

        "libbase",

        "libbinder",

cmds/installd/dexopt.cpp

+121 −69

File changed.

Preview size limit exceeded, changes collapsed.

cmds/installd/dexopt_return_codes.h

0 → 100644
+119 −0

File added.

Preview size limit exceeded, changes collapsed.

cmds/installd/tests/installd_dexopt_test.cpp

+6 −4
Original line number Diff line number Diff line
@@ -499,7 +499,8 @@ TEST_F(DexoptTest, DexoptSecondaryStorageValidationError) { 
    binder::Status status;

    CompileSecondaryDex(secondary_dex_ce_, DEXOPT_STORAGE_DE,

        /*binder_ok*/ false,  /*compile_ok*/ false, &status);

    EXPECT_STREQ(status.toString8().c_str(), "Status(-8): '-1: Failed processing secondary.'");

    EXPECT_STREQ(status.toString8().c_str(),

                 "Status(-8): '-1: Dexoptanalyzer path validation failed'");

}



TEST_F(DexoptTest, DexoptSecondaryAppOwnershipValidationError) {
@@ -507,7 +508,8 @@ TEST_F(DexoptTest, DexoptSecondaryAppOwnershipValidationError) { 
    binder::Status status;

    CompileSecondaryDex("/data/data/random.app/secondary.jar", DEXOPT_STORAGE_CE,

        /*binder_ok*/ false,  /*compile_ok*/ false, &status);

    EXPECT_STREQ(status.toString8().c_str(), "Status(-8): '-1: Failed processing secondary.'");

    EXPECT_STREQ(status.toString8().c_str(),

                 "Status(-8): '-1: Dexoptanalyzer path validation failed'");

}



TEST_F(DexoptTest, DexoptSecondaryAcessViaDifferentUidError) {
@@ -515,7 +517,7 @@ TEST_F(DexoptTest, DexoptSecondaryAcessViaDifferentUidError) { 
    binder::Status status;

    CompileSecondaryDex(secondary_dex_ce_, DEXOPT_STORAGE_CE,

        /*binder_ok*/ false,  /*compile_ok*/ false, &status, kSystemUid);

    EXPECT_STREQ(status.toString8().c_str(), "Status(-8): '-1: Failed processing secondary.'");

    EXPECT_STREQ(status.toString8().c_str(), "Status(-8): '-1: Dexoptanalyzer open zip failed'");

}



TEST_F(DexoptTest, DexoptPrimaryPublic) {
@@ -538,7 +540,7 @@ TEST_F(DexoptTest, DexoptPrimaryFailedInvalidFilter) { 
                          &status);

    EXPECT_STREQ(status.toString8().c_str(),

                 "Status(-8): \'256: Dex2oat invocation for "

                 "/data/app/com.installd.test.dexopt/base.jar failed with 0x0100\'");

                 "/data/app/com.installd.test.dexopt/base.jar failed: unspecified dex2oat error'");

}



TEST_F(DexoptTest, DexoptPrimaryProfileNonPublic) {