commit 5beb9a447597d92cfe9613421d0dc8cc34d54a6c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Sep 05 18:12:08 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 05 18:12:08 2024 +0000
tree 35f53056ecfd8ff7ffc391f38b2c68a792dd3bba
parent 4fc25cc0af339bbb6bde9a9858e555a145555d90
parent 75370a901240e54bcc6081bd7542b31e4dd187d2

Merge "Add Soong config variable for libgbm build variants" into main

Android.bp

diff --git a/Android.bp b/Android.bp
index ce5977a..9ade3ba 100644
--- a/Android.bp
+++ b/Android.bp
@@ -142,6 +142,16 @@
     srcs: [":minigbm_gralloc0_files"],
 }
 
+generic_cflags = ["-DHAS_DMABUF_SYSTEM_HEAP"]
+intel_cflags = ["-DDRV_I915"]
+meson_cflags = ["-DDRV_MESON"]
+msm_cflags = [
+    "-DDRV_MSM",
+    "-DQCOM_DISABLE_COMPRESSED_NV12",
+    "-DHAS_DMABUF_SYSTEM_HEAP",
+]
+arcvm_cflags = ["-DVIRTIO_GPU_NEXT"]
+
 cc_library {
     name: "libgbm",
     defaults: ["minigbm_defaults"],
@@ -153,6 +163,15 @@
         "gbm_helpers.c",
     ],
 
+    cflags: select(soong_config_variable("minigbm", "platform"), {
+        "generic": generic_cflags,
+        "intel": intel_cflags,
+        "meson": meson_cflags,
+        "msm": msm_cflags,
+        "arcvm": arcvm_cflags,
+        default: [],
+    }),
+
     target: {
         host: {
             // Avoid linking to another host copy of libdrm; this library will cause
@@ -211,7 +230,7 @@
 cc_library_shared {
     name: "libminigbm_gralloc",
     defaults: ["minigbm_cros_gralloc_library_defaults"],
-    cflags: ["-DHAS_DMABUF_SYSTEM_HEAP"],
+    cflags: generic_cflags,
 }
 
 cc_library_shared {
@@ -234,7 +253,7 @@
 cc_library_shared {
     name: "libminigbm_gralloc_intel",
     defaults: ["minigbm_cros_gralloc_library_defaults"],
-    cflags: ["-DDRV_I915"],
+    cflags: intel_cflags,
     enabled: false,
     arch: {
         x86: {
@@ -265,7 +284,7 @@
 cc_library_shared {
     name: "libminigbm_gralloc_meson",
     defaults: ["minigbm_cros_gralloc_library_defaults"],
-    cflags: ["-DDRV_MESON"],
+    cflags: meson_cflags,
 }
 
 cc_library_shared {
@@ -278,11 +297,7 @@
 cc_library_shared {
     name: "libminigbm_gralloc_msm",
     defaults: ["minigbm_cros_gralloc_library_defaults"],
-    cflags: [
-        "-DDRV_MSM",
-        "-DQCOM_DISABLE_COMPRESSED_NV12",
-        "-DHAS_DMABUF_SYSTEM_HEAP",
-    ],
+    cflags: msm_cflags,
 }
 
 cc_library_shared {
@@ -295,7 +310,7 @@
 cc_library_shared {
     name: "libminigbm_gralloc_arcvm",
     defaults: ["minigbm_cros_gralloc_library_defaults"],
-    cflags: ["-DVIRTIO_GPU_NEXT"],
+    cflags: arcvm_cflags,
 }
 
 cc_library_shared {