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

Commit 4e2e4c93 authored by Victor Hsieh's avatar Victor Hsieh
Browse files

Revert "Remove workarounds by data_device_bins" 

This reverts commit 279bf212.

Manual change:
 * Resolved conflicts in Android.bp to not change "test_suites".
 * bpfmt to silence repo upload warning

Fixes: 229948069
Fixes: 230556754
Test: TH
Change-Id: Iecccae4008c6fefd3f6ab47fb5e37ca4b22090be
parent 253e417e

tests/ApkVerityTest/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ java_test_host { 
        "general-tests",

        "vts",

    ],

    data_device_bins: [

        "block_device_writer",

    target_required: [

        "block_device_writer_module",

    ],

    data: [

        ":ApkVerityTestCertDer",

tests/ApkVerityTest/block_device_writer/Android.bp

+22 −2
Original line number Diff line number Diff line
@@ -24,7 +24,12 @@ package { 
}



cc_test {

    name: "block_device_writer",

    // Depending on how the test runs, the executable may be uploaded to different location.

    // Before the bug in the file pusher is fixed, workaround by making the name unique.

    // See b/124718249#comment12.

    name: "block_device_writer_module",

    stem: "block_device_writer",



    srcs: ["block_device_writer.cpp"],

    cflags: [

        "-D_FILE_OFFSET_BITS=64",
@@ -37,7 +42,22 @@ cc_test { 
        "libbase",

        "libutils",

    ],

    compile_multilib: "first",

    // For some reasons, cuttlefish (x86) uses x86_64 test suites for testing. Unfortunately, when

    // the uploader does not pick up the executable from correct output location. The following

    // workaround allows the test to:

    //  * upload the 32-bit exectuable for both 32 and 64 bits devices to use

    //  * refer to the same executable name in Java

    //  * no need to force the Java test to be archiecture specific.

    //

    // See b/145573317 for details.

    multilib: {

        lib32: {

            suffix: "",

        },

        lib64: {

            suffix: "64", // not really used

        },

    },



    auto_gen_config: false,

    test_suites: [

tests/ApkVerityTest/block_device_writer/src/com/android/blockdevicewriter/BlockDeviceWriter.java

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import java.util.ArrayList; 
 * <p>To use this class, please push block_device_writer binary to /data/local/tmp.

 * 1. In Android.bp, add:

 * <pre>

 *      data_device_bins: ["block_device_writer"],

 *     target_required: ["block_device_writer_module"],

 * </pre>

 * 2. In AndroidText.xml, add:

 * <pre>