drm_hwcomposer: Move client flattening closer to the frontend

[android-x86/external-drm_hwcomposer.git] / Android.bp

diff --git a/Android.bp b/Android.bp
index b8de984..ddf66fb 100644 (file)
--- a/Android.bp
+++ b/Android.bp
@@ -18,7 +18,12 @@
 cc_library_static {
     name: "libdrmhwc_utils",
 
-    srcs: ["worker.cpp"],
+    srcs: ["utils/Worker.cpp"],
+
+    include_dirs: [
+        "external/drm_hwcomposer",
+        "external/drm_hwcomposer/include",
+    ],
 
     cflags: [
         "-Wall",
@@ -39,74 +44,110 @@ cc_defaults {
         "libcutils",
         "libdrm",
         "libhardware",
+        "libhidlbase",
         "liblog",
         "libsync",
         "libui",
         "libutils",
     ],
 
+    include_dirs: [
+        "external/drm_hwcomposer",
+        "external/drm_hwcomposer/include",
+    ],
+
     static_libs: ["libdrmhwc_utils"],
 
-    srcs: [
-        "autolock.cpp",
-        "resourcemanager.cpp",
-        "drmdevice.cpp",
-        "drmconnector.cpp",
-        "drmcrtc.cpp",
-        "drmdisplaycomposition.cpp",
-        "drmdisplaycompositor.cpp",
-        "drmencoder.cpp",
-        "drmeventlistener.cpp",
-        "drmhwctwo.cpp",
-        "drmmode.cpp",
-        "drmplane.cpp",
-        "drmproperty.cpp",
-        "hwcutils.cpp",
-        "platform.cpp",
-        "platformdrmgeneric.cpp",
-        "vsyncworker.cpp",
-    ],
     cflags: [
         "-Wall",
         "-Werror",
     ],
 
     cppflags: [
-        "-DHWC2_USE_CPP11",
         "-DHWC2_INCLUDE_STRINGIFICATION",
+        "-DHWC2_USE_CPP11",
     ],
 
+    product_variables: {
+        platform_sdk_version: {
+            cflags: ["-DPLATFORM_SDK_VERSION=%d"],
+        },
+    },
+
     relative_install_path: "hw",
     vendor: true,
 }
 
-cc_library_shared {
-    name: "hwcomposer.drm",
+cc_library_static {
+    name: "drm_hwcomposer",
     defaults: ["hwcomposer.drm_defaults"],
-    cppflags: ["-DUSE_DRM_GENERIC_IMPORTER"],
+    srcs: [
+        "DrmHwcTwo.cpp",
+
+        "bufferinfo/BufferInfoGetter.cpp",
+        "bufferinfo/BufferInfoMapperMetadata.cpp",
+
+        "compositor/DrmDisplayComposition.cpp",
+        "compositor/DrmDisplayCompositor.cpp",
+        "compositor/Planner.cpp",
+
+        "drm/DrmConnector.cpp",
+        "drm/DrmCrtc.cpp",
+        "drm/DrmDevice.cpp",
+        "drm/DrmEncoder.cpp",
+        "drm/DrmEventListener.cpp",
+        "drm/DrmFbImporter.cpp",
+        "drm/DrmMode.cpp",
+        "drm/DrmPlane.cpp",
+        "drm/DrmProperty.cpp",
+        "drm/ResourceManager.cpp",
+        "drm/VSyncWorker.cpp",
+
+        "utils/autolock.cpp",
+        "utils/hwcutils.cpp",
+
+        "backend/Backend.cpp",
+        "backend/BackendClient.cpp",
+        "backend/BackendManager.cpp",
+        "backend/BackendRCarDu.cpp",
+    ],
 }
 
 cc_library_shared {
-    name: "hwcomposer.drm_hikey",
+    name: "hwcomposer.drm",
     defaults: ["hwcomposer.drm_defaults"],
-    cppflags: ["-DUSE_HISI_IMPORTER"],
-    srcs: ["platformhisi.cpp"],
-    include_dirs: ["device/linaro/hikey/gralloc"],
+    whole_static_libs: ["drm_hwcomposer"],
+    srcs: ["bufferinfo/legacy/BufferInfoLibdrm.cpp"],
 }
 
 cc_library_shared {
-    name: "hwcomposer.drm_hikey960",
+    name: "hwcomposer.drm_minigbm",
     defaults: ["hwcomposer.drm_defaults"],
-    cppflags: ["-DUSE_HISI_IMPORTER"],
-    srcs: ["platformhisi.cpp"],
-    include_dirs: ["device/linaro/hikey/gralloc960"],
+    whole_static_libs: ["drm_hwcomposer"],
+    srcs: ["bufferinfo/legacy/BufferInfoMinigbm.cpp"],
+    include_dirs: ["external/minigbm/cros_gralloc"],
 }
 
+// Used by hwcomposer.drm_imagination
+filegroup {
+    name: "drm_hwcomposer_platformimagination",
+    srcs: ["bufferinfo/legacy/BufferInfoImagination.cpp"],
+}
 
-cc_library_shared {
-    name: "hwcomposer.drm_minigbm",
-    defaults: ["hwcomposer.drm_defaults"],
-    srcs: ["platformminigbm.cpp"],
-    include_dirs: ["external/minigbm/cros_gralloc"],
+// Used by hwcomposer.drm_hikey and hwcomposer.drm_hikey960
+filegroup {
+    name: "drm_hwcomposer_platformhisi",
+    srcs: ["bufferinfo/legacy/BufferInfoMaliHisi.cpp"],
 }
 
+// Used by hwcomposer.drm_meson
+filegroup {
+    name: "drm_hwcomposer_platformmeson",
+    srcs: ["bufferinfo/legacy/BufferInfoMaliMeson.cpp"],
+}
+
+// Used by hwcomposer.drm_mediatek
+filegroup {
+    name: "drm_hwcomposer_platformmediatek",
+    srcs: ["bufferinfo/legacy/BufferInfoMaliMediatek.cpp"],
+}