Make framework-res dep in stubs explicit
The android.jar stubs includes the resource from framework-res. This
dependency was previously added implicitly inside the build system, but
using a java_genrule we can add it directly, which makes it easier to
make changes to this rule.
This change has the side-effect of adding the resources to some stubs
that did not previously include the resources (e.g. module-libs), which
I think is desired.
Bug: 161214753
Test: build sdk, diff out/dist before and after (shows resources added
to some stubs)
Change-Id: I1829789af207cc45c49c0c68369fc7c0c085bcb0
Merged-In: I1829789af207cc45c49c0c68369fc7c0c085bcb0
This commit is contained in:
committed by
Liz Kammer
parent
d5726423ca
commit
47994f3743
@@ -305,6 +305,9 @@ droidstubs {
|
||||
java_defaults {
|
||||
name: "android_defaults_stubs_current",
|
||||
libs: [ "stub-annotations" ],
|
||||
static_libs: [
|
||||
"framework-res-package-jar", // Export package of framework-res
|
||||
],
|
||||
errorprone: {
|
||||
javacflags: [
|
||||
"-XepDisableAllChecks",
|
||||
|
||||
@@ -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
|
||||
filegroup {
|
||||
name: "robolectric_framework_raw_res_files",
|
||||
|
||||
Reference in New Issue
Block a user