From 47994f37433e5f3e6f4522403e645ff0826e77ba Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Thu, 13 Aug 2020 19:40:13 +0100
Subject: [PATCH] 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
---
 StubLibraries.bp    | 3 +++
 core/res/Android.bp | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/StubLibraries.bp b/StubLibraries.bp
index ef4e202fdfe25..3eb482dc5dc57 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -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",
diff --git a/core/res/Android.bp b/core/res/Android.bp
index b365de4f4630d..f94a2b08e6c39 100644
--- a/core/res/Android.bp
+++ b/core/res/Android.bp
@@ -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",