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

Commit 860f8b38 authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Use ART stubs source generated by java_sdk_library" am: b9969456 am:... 

Merge "Use ART stubs source generated by java_sdk_library" am: b9969456 am: 54fa7623 am: ad9299dc am: 471182f8

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

Change-Id: Idb646f9bf7d0d2f7aff4dc52736cfcd029fab6dd
parents bec81240 471182f8

ApiDocs.bp

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ stubs_defaults { 
        "test-base/src/**/*.java",

        ":opt-telephony-srcs",

        ":opt-net-voip-srcs",

        ":art-module-public-api-stubs-source",

        ":art.module.public.api{.public.stubs.source}",

        ":conscrypt.module.public.api{.public.stubs.source}",

        ":android_icu4j_public_api_files",

        "test-mock/src/**/*.java",

StubLibraries.bp

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ stubs_defaults { 
        "core/java/**/*.logtags",

        ":opt-telephony-srcs",

        ":opt-net-voip-srcs",

        ":art-module-public-api-stubs-source",

        ":art.module.public.api{.public.stubs.source}",

        ":android_icu4j_public_api_files",

        "**/package.html",

    ],