summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-01-04 20:50:04 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-01-04 20:50:04 +0000
commit919205cd2dc72d1e9d68a94015eb598b75a8b980 (patch)
tree2dbcd5b5596907aab0c475f79004293ca442c476
parent6d82bd5e554ab757f7e733951d5960cbbcfd55b6 (diff)
parent4e76a260d161f5b5111e7d9c989603410a0cef26 (diff)
downloadhikey-919205cd2dc72d1e9d68a94015eb598b75a8b980.tar.gz
Merge "hikey: Use filegroup for drm_hwcomposer common files" am: de8954df2e am: 4e76a260d1
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1879478 Change-Id: Ied7eed347f84ddce67007cc77cc487336d14b004
-rw-r--r--gralloc/Android.bp6
-rw-r--r--gralloc960/Android.bp6
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",
+ ],
}