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

Commit f137d788 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Reference libcore, conscrypt and icu sources directly" am:... 

Merge "Merge "Reference libcore, conscrypt and icu sources directly" am: 77481306 am: 0843760b am: a1248cae" into rvc-d1-dev-plus-aosp
parents 87309cd4 203e799b

ApiDocs.bp

+3 −2
Original line number Diff line number Diff line
@@ -65,8 +65,9 @@ stubs_defaults { 
        "test-base/src/**/*.java",

        ":opt-telephony-srcs",

        ":opt-net-voip-srcs",

        ":core-current-stubs-source",

        ":core_public_api_files",

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

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

        ":android_icu4j_public_api_files",

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

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

    ],

StubLibraries.bp

+3 −2
Original line number Diff line number Diff line
@@ -47,8 +47,9 @@ stubs_defaults { 
        "core/java/**/*.logtags",

        ":opt-telephony-srcs",

        ":opt-net-voip-srcs",

        ":core-current-stubs-source",

        ":core_public_api_files",

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

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

        ":android_icu4j_public_api_files",

    ],

    // TODO(b/147699819): remove below aidl includes.

    aidl: {