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

Commit 62c9b0a4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix test/Android.bp on ARC builds" am: 8b4da2ff am: 8ab7f17d am: fd410b9e

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1467064

Change-Id: Ie7c00fb4684c299ae39bccdf992aa636c5b4b0a6
parents 1652fc33 fd410b9e
Loading
Loading
Loading
Loading
+45 −0
Original line number Diff line number Diff line
@@ -41,6 +41,21 @@ cc_test {
        "liblogwrap",
    ],
    test_config: "installd_cache_test.xml",

    product_variables: {
        arc: {
            exclude_srcs: [
                "QuotaUtils.cpp",
            ],
            static_libs: [
                "libarcdiskquota",
                "arc_services_aidl",
            ],
            cflags: [
                "-DUSE_ARC",
            ],
        },
    },
}

cc_test {
@@ -66,6 +81,21 @@ cc_test {
        "liblogwrap",
    ],
    test_config: "installd_service_test.xml",

    product_variables: {
        arc: {
            exclude_srcs: [
                "QuotaUtils.cpp",
            ],
            static_libs: [
                "libarcdiskquota",
                "arc_services_aidl",
            ],
            cflags: [
                "-DUSE_ARC",
            ],
        },
    },
}

cc_test {
@@ -93,6 +123,21 @@ cc_test {
        "libz",
    ],
    test_config: "installd_dexopt_test.xml",

    product_variables: {
        arc: {
            exclude_srcs: [
                "QuotaUtils.cpp",
            ],
            static_libs: [
                "libarcdiskquota",
                "arc_services_aidl",
            ],
            cflags: [
                "-DUSE_ARC",
            ],
        },
    },
}

cc_test {