Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reference libcore, conscrypt and icu sources directly" into rvc-dev am: c96262a856 am: 9f1bead44e am: c7e090c29b

Browse Source 
Change-Id: Iba68a46a3e2e2de9577d23996e5a46b966c57466
This commit is contained in:
Paul Duffin
2020-04-28 13:38:36 +00:00
committed by Automerger Merge Worker
parent b3d64ead99 c7e090c29b
commit 15a6ae3f5d
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApiDocs.bp
View File

@@ -65,8 +65,9 @@ stubs_defaults {
"test-base/src/**/*.java", "test-base/src/**/*.java",
":opt-telephony-srcs", ":opt-telephony-srcs",
":opt-net-voip-srcs", ":opt-net-voip-srcs",
":core-current-stubs-source", ":art-module-public-api-stubs-source",
":core_public_api_files", ":conscrypt-module-public-api-stubs-source",
":android_icu4j_public_api_files",
"test-mock/src/**/*.java", "test-mock/src/**/*.java",
"test-runner/src/**/*.java", "test-runner/src/**/*.java",
], ],

5
StubLibraries.bp
View File

@@ -47,8 +47,9 @@ stubs_defaults {
"core/java/**/*.logtags", "core/java/**/*.logtags",
":opt-telephony-srcs", ":opt-telephony-srcs",
":opt-net-voip-srcs", ":opt-net-voip-srcs",
":core-current-stubs-source", ":art-module-public-api-stubs-source",
":core_public_api_files", ":conscrypt-module-public-api-stubs-source",
":android_icu4j_public_api_files",
], ],
// TODO(b/147699819): remove below aidl includes. // TODO(b/147699819): remove below aidl includes.
aidl: { aidl: {