diff options
| author | 2024-10-24 00:24:19 +0000 | |
|---|---|---|
| committer | 2024-10-24 00:24:19 +0000 | |
| commit | ceb0912409ea09b2c26940ee38a3f6dc177a286c (patch) | |
| tree | f3f5ccb24b96da139789bd59c48ca3344d278b6d /libs | |
| parent | 688980205782678e34216242b9787e227c023309 (diff) | |
| parent | 3f1eba32bdeb7d585776c2198810e69f95e69a38 (diff) | |
Merge "Remove dependencies on the 1-variant fallback" into main am: 3f1eba32bd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3317794
Change-Id: Iddda7a7222f151c2ca47f851964046b2255f95ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/WindowManager/Shell/Android.bp | 8 | ||||
| -rw-r--r-- | libs/androidfw/Android.bp | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libs/WindowManager/Shell/Android.bp b/libs/WindowManager/Shell/Android.bp index 25d3067a34bc..4b0c7009eaa0 100644 --- a/libs/WindowManager/Shell/Android.bp +++ b/libs/WindowManager/Shell/Android.bp @@ -79,7 +79,7 @@ filegroup { path: "src", } -genrule { +java_genrule { name: "wm_shell_protolog_src", srcs: [ ":protolog-impl", @@ -99,7 +99,7 @@ genrule { out: ["wm_shell_protolog.srcjar"], } -genrule { +java_genrule { name: "generate-wm_shell_protolog.json", srcs: [ ":wm_shell_protolog-groups", @@ -116,7 +116,7 @@ genrule { out: ["wm_shell_protolog.json"], } -genrule { +java_genrule { name: "gen-wmshell.protolog.pb", srcs: [ ":wm_shell_protolog-groups", @@ -133,7 +133,7 @@ genrule { out: ["wmshell.protolog.pb"], } -genrule { +java_genrule { name: "protolog.json.gz", srcs: [":generate-wm_shell_protolog.json"], out: ["wmshell.protolog.json.gz"], diff --git a/libs/androidfw/Android.bp b/libs/androidfw/Android.bp index 77800a305f02..15ef58ecf3bd 100644 --- a/libs/androidfw/Android.bp +++ b/libs/androidfw/Android.bp @@ -258,6 +258,8 @@ cc_test { "tests/data/**/*.apk", "tests/data/**/*.arsc", "tests/data/**/*.idmap", + ], + device_common_data: [ ":FrameworkResourcesSparseTestApp", ":FrameworkResourcesNotSparseTestApp", ], |