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

Commit e897b042 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Android (Google) Code Review
Browse files

Merge "Add jarjar rules for telephony tests"

parents ac9c0b41 f926c802
Loading
Loading
Loading
Loading
+13 −1
Original line number Diff line number Diff line
@@ -25,10 +25,22 @@ android_test {
    ],

    platform_apis: true,
    jarjar_rules: ":jarjar-rules-shared",
    jarjar_rules: ":jarjar-rules-telephony-tests",

    test_suites: [
        "mts",
        "device-tests",
    ],
}

genrule {
    name: "jarjar-rules-telephony-tests",
    srcs: [
        // Order matters: test rules override the base ones
        "jarjar-rules-tests.txt",
        ":jarjar-rules-shared",
    ],
    out: ["jarjar-rules-telephony-tests-combined.txt"],
    cmd: "cat $(in) > $(out)",
    visibility: ["//visibility:private"],
}
+6 −0
Original line number Diff line number Diff line
# NetworkFactory is included in telephony-common and services.net
# Rename the non-jarjared, services.net version to avoid conflicts.
# This causes two NetworkFactory classes to appear in the test package (one used
# by services-net and one by telephony-common), similarly to what happens on a
# real device, except that in the test they have different package names.
rule android.net.NetworkFactory* android.net.services.NetworkFactory@1