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

Commit 8e6e52ec authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Move testapi API files for symmetry with others" am: 78d50486 am: b6177fc4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1488697

Change-Id: Id5e5d7d3a0eadbcd6183716a429f5b9849fef7fa
parents 0589ecb8 b6177fc4
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ droidstubs {
}

droidstubs {
    name: "test-api-stubs-docs",
    name: "test-api-stubs-docs-non-updatable",
    defaults: ["metalava-non-updatable-api-stubs-default"],
    arg_files: [
        "core/res/AndroidManifest.xml",
@@ -237,12 +237,12 @@ droidstubs {
        + "\\)",
    check_api: {
        current: {
            api_file: "api/test-current.txt",
            removed_api_file: "api/test-removed.txt",
            api_file: "core/api/test-current.txt",
            removed_api_file: "core/api/test-removed.txt",
        },
        api_lint: {
            enabled: true,
            baseline_file: "api/test-lint-baseline.txt",
            baseline_file: "core/api/test-lint-baseline.txt",
        },
    },
    dist: {
@@ -361,7 +361,7 @@ java_library_static {

java_library_static {
    name: "android_test_stubs_current",
    srcs: [ ":test-api-stubs-docs" ],
    srcs: [ ":test-api-stubs-docs-non-updatable" ],
    static_libs: [
        // Modules do not have test APIs, but we want to include their SystemApis, like we include
        // the SystemApi of framework-non-updatable-sources.
+0 −0

File moved.

+0 −0

File moved.