commit 919205cd2dc72d1e9d68a94015eb598b75a8b980
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 04 20:50:04 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 04 20:50:04 2022 +0000
tree 2dbcd5b5596907aab0c475f79004293ca442c476
parent 6d82bd5e554ab757f7e733951d5960cbbcfd55b6
parent 4e76a260d161f5b5111e7d9c989603410a0cef26

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

gralloc/Android.bp

diff --git a/gralloc/Android.bp b/gralloc/Android.bp
index 44da39e..aaca7cb 100644
--- a/gralloc/Android.bp
+++ b/gralloc/Android.bp
@@ -11,6 +11,8 @@
 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",
+    ],
 }

gralloc960/Android.bp

diff --git a/gralloc960/Android.bp b/gralloc960/Android.bp
index b8e39c5..6939a52 100644
--- a/gralloc960/Android.bp
+++ b/gralloc960/Android.bp
@@ -11,6 +11,8 @@
 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",
+    ],
 }