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

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

Merge "Reference libcore, conscrypt and icu sources directly" am: 77481306 am: 0843760b 

Change-Id: Id81fcef1856a0cb3b3df5572cc9623a31d718734
parents 2d758734 0843760b

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: {