diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-01-04 21:25:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-04 21:25:34 +0000 |
| commit | 573138df6087db917be50597a82949afcb2edfd7 (patch) | |
| tree | 2dbcd5b5596907aab0c475f79004293ca442c476 | |
| parent | 6c9968b3a27a5e34a447e7d721c9590ef2293781 (diff) | |
| parent | 2ae671141ff5cb2fbdc1a3cc33e678a84704b616 (diff) | |
| download | hikey-573138df6087db917be50597a82949afcb2edfd7.tar.gz | |
Merge "hikey: Use filegroup for drm_hwcomposer common files" am: de8954df2e am: 4e76a260d1 am: 919205cd2d am: 2ae671141f
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1879478
Change-Id: I2a3a6d21bacd634b595e99b6680858481f43e825
| -rw-r--r-- | gralloc/Android.bp | 6 | ||||
| -rw-r--r-- | gralloc960/Android.bp | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/gralloc/Android.bp b/gralloc/Android.bp index 44da39ed..aaca7cbd 100644 --- a/gralloc/Android.bp +++ b/gralloc/Android.bp @@ -11,6 +11,8 @@ package { cc_library_shared { name: "hwcomposer.drm_hikey", defaults: ["hwcomposer.drm_defaults"], - srcs: [":drm_hwcomposer_platformhisi"], - whole_static_libs: ["drm_hwcomposer"], + srcs: [ + ":drm_hwcomposer_common", + ":drm_hwcomposer_platformhisi", + ], } diff --git a/gralloc960/Android.bp b/gralloc960/Android.bp index b8e39c51..6939a52f 100644 --- a/gralloc960/Android.bp +++ b/gralloc960/Android.bp @@ -11,6 +11,8 @@ package { cc_library_shared { name: "hwcomposer.drm_hikey960", defaults: ["hwcomposer.drm_defaults"], - srcs: [":drm_hwcomposer_platformhisi"], - whole_static_libs: ["drm_hwcomposer"], + srcs: [ + ":drm_hwcomposer_common", + ":drm_hwcomposer_platformhisi", + ], } |