diff options
| author | 2020-08-18 12:12:21 +0000 | |
|---|---|---|
| committer | 2020-08-18 12:12:21 +0000 | |
| commit | dffa4110c6a53b159f936f72064d7dcea90a97ab (patch) | |
| tree | 0ac86ea69d5e88e27bb6a6e0386bd47d00c7d624 | |
| parent | 2b86731b42e8ef8cec147e2c7f34c85c3b16190f (diff) | |
| parent | f0031bf3533c8f130130337ae9b4266711f432b4 (diff) | |
Merge "Make framework-res dep in stubs explicit" am: f0031bf353
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399179
Change-Id: Icad8a2244e01edd32dc1512e9b3f3aaacaf55d57
| -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 b999a10d0a3f..146b848ef2d1 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -287,6 +287,7 @@ java_defaults { // 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 3402033b04f1..99342b9d472a 100644 --- a/core/res/Android.bp +++ b/core/res/Android.bp @@ -40,6 +40,13 @@ android_app { export_package_resources: true, } +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", |