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

Merge "Make framework-res dep in stubs explicit" am: f0031bf353

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

Change-Id: Icad8a2244e01edd32dc1512e9b3f3aaacaf55d57
This commit is contained in:
Anton Hansson
2020-08-18 12:12:21 +00:00
committed by Automerger Merge Worker
parent 2b86731b42 f0031bf353
commit dffa4110c6
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
StubLibraries.bp
View File

@@ -287,6 +287,7 @@ java_defaults {
// License notices from art module // License notices from art module
"art-notices-for-framework-stubs-jar", "art-notices-for-framework-stubs-jar",
"framework-res-package-jar", // Export package of framework-res
], ],
errorprone: { errorprone: {
javacflags: [ javacflags: [

7
core/res/Android.bp
View File

@@ -40,6 +40,13 @@ android_app {
export_package_resources: true, export_package_resources: true,
} }
java_genrule {
name: "framework-res-package-jar",
srcs: [":framework-res{.export-package.apk}"],
out: ["framework-res-package.jar"],
cmd: "cp $(in) $(out)",
}
// This logic can be removed once robolectric's transition to binary resources is complete // This logic can be removed once robolectric's transition to binary resources is complete
filegroup { filegroup {
name: "robolectric_framework_raw_res_files", name: "robolectric_framework_raw_res_files",