diff options
| author | 2020-08-18 12:37:42 +0000 | |
|---|---|---|
| committer | 2020-08-18 12:37:42 +0000 | |
| commit | 318d951bff720d4fd58c190dbcd96ffcca4769dc (patch) | |
| tree | e66c0d92a85ffb9824c5e5b8c69e09c932374d07 | |
| parent | b5972dfa09ffaeb522dd3c24e5eef639424e3d51 (diff) | |
| parent | dcd62bcecfdc99b337d1e53b5bb314b9a0370f1d (diff) | |
Merge "Make framework-res dep in stubs explicit" am: f0031bf353 am: dffa4110c6 am: dcd62bcecf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399179
Change-Id: Id1023890a8fc69342f2dd072dcbc8f86b8125196
| -rw-r--r-- | StubLibraries.bp | 1 | ||||
| -rw-r--r-- | core/res/Android.bp | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp index a9e6e5af47f1..5f42eb9c6669 100644 --- a/StubLibraries.bp +++ b/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: [ diff --git a/core/res/Android.bp b/core/res/Android.bp index b365de4f4630..f94a2b08e6c3 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", |