Commit 47994f37 authored Aug 13, 2020 by Anton Hansson Committed by Liz Kammer Oct 15, 2020

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

parent d5726423

StubLibraries.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -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",

core/res/Android.bp

+7 −0

Original line number	Diff line number	Diff line
		@@ -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",