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 am: dffa4110c6 am: dcd62bcecf am: 318d951bff

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

Change-Id: I008e521c712d09f61c2276fe23609113326c8a5c
This commit is contained in:
Anton Hansson
2020-08-18 12:47:03 +00:00
committed by Automerger Merge Worker
parent 9637c20fdc 318d951bff
commit abdb4390c7
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

@@ -299,6 +299,7 @@ java_defaults {
static_libs: [ static_libs: [
// 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

@@ -46,6 +46,13 @@ android_app {
}, },
} }
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",