From df0683188b9f7901f7c89c8fc5f542c2ee79f588 Mon Sep 17 00:00:00 2001
From: yifang ma <yifangx.ma@intel.com>
Date: Thu, 5 Dec 2019 17:25:16 +0800
Subject: [PATCH] rename lib name to gralloc.intel

To avoid lib name conflicts from external minigbm.

Tracked-On: OAM-88753
Signed-off-by: yifang ma <yifangx.ma@intel.com>
---
 Android.bp | 52 +++++-----------------------------------------------
 1 file changed, 5 insertions(+), 47 deletions(-)

diff --git a/Android.bp b/Android.bp
index 63a50f7..7d6a05b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2,36 +2,21 @@
 // found in the LICENSE file.
 
 cc_defaults {
-    name: "gralloc.minigbm_intel_defaults",
+    name: "gralloc.minigbm_intel_defaults_pri",
     cflags: ["-DDRV_I915"],
 }
 
 cc_defaults {
-    name: "gralloc.minigbm_meson_defaults",
-    cflags: ["-DDRV_MESON"],
-}
-
-cc_defaults {
-    name: "gralloc.minigbm_defaults",
+    name: "gralloc.minigbm_defaults_pri",
 
     srcs: [
-        "amdgpu.c",
         "drv.c",
         "evdi.c",
-        "exynos.c",
         "helpers_array.c",
         "helpers.c",
         "i915.c",
-        "marvell.c",
-        "mediatek.c",
-        "meson.c",
-        "msm.c",
         "nouveau.c",
-        "radeon.c",
-        "rockchip.c",
-        "tegra.c",
         "udl.c",
-        "vc4.c",
         "vgem.c",
         "virtio_gpu.c",
 
@@ -76,15 +61,10 @@ cc_defaults {
 }
 
 cc_library_shared {
-    name: "gralloc.minigbm",
-    defaults: ["gralloc.minigbm_defaults"],
-}
-
-cc_library_shared {
-    name: "gralloc.minigbm_intel",
+    name: "gralloc.intel",
     defaults: [
-        "gralloc.minigbm_defaults",
-        "gralloc.minigbm_intel_defaults",
+        "gralloc.minigbm_defaults_pri",
+        "gralloc.minigbm_intel_defaults_pri",
     ],
     enabled: false,
     arch: {
@@ -96,25 +76,3 @@ cc_library_shared {
         },
     },
 }
-
-cc_library_shared {
-    name: "gralloc.minigbm_meson",
-    defaults: [
-        "gralloc.minigbm_defaults",
-        "gralloc.minigbm_meson_defaults",
-    ],
-}
-
-cc_library_shared {
-    name: "libminigbm",
-    defaults: ["gralloc.minigbm_defaults"],
-    shared_libs: ["liblog"],
-    static_libs: ["libdrm"],
-
-    srcs: [
-        "gbm.c",
-        "gbm_helpers.c",
-    ],
-
-    export_include_dirs: ["."],
-}