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

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

Change-Id: I7975a93cbbf95a0b199348e2155eff51227f9db8

StubLibraries.bp

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

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",