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

Commit 279bf212 authored by Victor Hsieh's avatar Victor Hsieh
Browse files

Remove workarounds by data_device_bins 

Previously, the test has dirty hacks that force building the device
executable in correct name. Swicth to the proper solution now that we
have it.

Also, re-format to make the upload hook happy.

Bug: 182919153
Test: atest ApkVerityTest
Change-Id: I4db2cdbfc5cf435113e6972654e999166f369d9f
parent 1e4e6962

tests/ApkVerityTest/Android.bp

+11 −4
Original line number Diff line number Diff line
@@ -24,14 +24,21 @@ package { 
java_test_host {

    name: "ApkVerityTest",

    srcs: ["src/**/*.java"],

    libs: ["tradefed", "compatibility-tradefed", "compatibility-host-util"],

    libs: [

        "tradefed",

        "compatibility-tradefed",

        "compatibility-host-util",

    ],

    static_libs: [

        "block_device_writer_jar",

        "frameworks-base-hostutils",

    ],

    test_suites: ["general-tests", "vts"],

    target_required: [

        "block_device_writer_module",

    test_suites: [

        "general-tests",

        "vts",

    ],

    data_device_bins: [

        "block_device_writer",

    ],

    data: [

        ":ApkVerityTestCertDer",

tests/ApkVerityTest/block_device_writer/Android.bp

+15 −25
Original line number Diff line number Diff line
@@ -24,12 +24,7 @@ package { 
}



cc_test {

    // 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",



    name: "block_device_writer",

    srcs: ["block_device_writer.cpp"],

    cflags: [

        "-D_FILE_OFFSET_BITS=64",
@@ -38,31 +33,26 @@ cc_test { 
        "-Wextra",

        "-g",

    ],

    shared_libs: ["libbase", "libutils"],

    // 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

        },

    },

    shared_libs: [

        "libbase",

        "libutils",

    ],

    compile_multilib: "first",



    auto_gen_config: false,

    test_suites: ["general-tests", "pts", "vts"],

    test_suites: [

        "general-tests",

        "pts",

        "vts",

    ],

    gtest: false,

}



java_library_host {

    name: "block_device_writer_jar",

    srcs: ["src/**/*.java"],

    libs: ["tradefed", "junit"],

    libs: [

        "tradefed",

        "junit",

    ],

}

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>

 *     target_required: ["block_device_writer_module"],

 *      data_device_bins: ["block_device_writer"],

 * </pre>

 * 2. In AndroidText.xml, add:

 * <pre>