From f5e70ba875fe637f28ffd38ef7828fbc432ffc44 Mon Sep 17 00:00:00 2001
From: northking-super <chenxin100@huawei.com>
Date: Sat, 13 Nov 2021 07:41:58 +0000
Subject: [PATCH] fix display build err

Signed-off-by: northking-super <chenxin100@huawei.com>
---
 hal/display/BUILD.gn | 71 ++++++++++++++++----------------------------
 1 file changed, 26 insertions(+), 45 deletions(-)

diff --git a/hal/display/BUILD.gn b/hal/display/BUILD.gn
index 37d18fe3..423889a3 100755
--- a/hal/display/BUILD.gn
+++ b/hal/display/BUILD.gn
@@ -17,32 +17,32 @@ if (defined(ohos_lite)) {
 
   if (ohos_build_compiler == "clang" && ohos_kernel_type == "liteos_a") {
     copy("display_layer") {
-      sources = [ "${board_name}/llvm/ohos/libdisplay_layer.so" ]
+      sources = [ "${board_name}/ohos/libdisplay_layer.so" ]
       outputs = [ "$root_out_dir/libdisplay_layer.so" ]
     }
 
     copy("display_gfx") {
-      sources = [ "${board_name}/llvm/ohos/libdisplay_gfx.so" ]
+      sources = [ "${board_name}/ohos/libdisplay_gfx.so" ]
       outputs = [ "$root_out_dir/libdisplay_gfx.so" ]
     }
 
     copy("display_gralloc") {
-      sources = [ "${board_name}/llvm/ohos/libdisplay_gralloc.so" ]
+      sources = [ "${board_name}/ohos/libdisplay_gralloc.so" ]
       outputs = [ "$root_out_dir/libdisplay_gralloc.so" ]
     }
   } else if (ohos_build_compiler == "clang" && ohos_kernel_type == "linux") {
     copy("display_layer") {
-      sources = [ "${board_name}/llvm/linux/libdisplay_layer.so" ]
+      sources = [ "${board_name}/linux/libdisplay_layer.so" ]
       outputs = [ "$root_out_dir/libdisplay_layer.so" ]
     }
 
     copy("display_gfx") {
-      sources = [ "${board_name}/llvm/linux/libdisplay_gfx.so" ]
+      sources = [ "${board_name}/linux/libdisplay_gfx.so" ]
       outputs = [ "$root_out_dir/libdisplay_gfx.so" ]
     }
 
     copy("display_gralloc") {
-      sources = [ "${board_name}/llvm/linux/libdisplay_gralloc.so" ]
+      sources = [ "${board_name}/linux/libdisplay_gralloc.so" ]
       outputs = [ "$root_out_dir/libdisplay_gralloc.so" ]
     }
   }
@@ -76,69 +76,50 @@ if (defined(ohos_lite)) {
   import("//build/ohos.gni")
 
   ohos_prebuilt_shared_library("display_device") {
-    if (use_musl) {
-      if (target_cpu == "arm") {
-        source = "hispark_taurus/llvm/linux_standard/lib/libdisplay_device.z.so"
-      } else {
-        source =
-            "hispark_taurus/llvm/linux_standard/lib64/libdisplay_device.z.so"
-      }
+    if (target_cpu == "arm") {
+      source = "hispark_taurus/linux_standard/lib/libdisplay_device.z.so"
     } else {
-      source = "hispark_taurus/ext/libdisplay_device.z.so"
+      source = "hispark_taurus/linux_standard/lib64/libdisplay_device.z.so"
     }
     subsystem_name = "hdf"
   }
 
   ohos_prebuilt_shared_library("display_gralloc") {
-    if (use_musl) {
-      if (target_cpu == "arm") {
-        source =
-            "hispark_taurus/llvm/linux_standard/lib/libdisplay_gralloc.z.so"
-      } else {
-        source =
-            "hispark_taurus/llvm/linux_standard/lib64/libdisplay_gralloc.z.so"
-      }
+    if (target_cpu == "arm") {
+      source =
+          "hispark_taurus/linux_standard/lib/libdisplay_gralloc.z.so"
     } else {
-      source = "hispark_taurus/ext/libdisplay_gralloc.z.so"
+      source =
+          "hispark_taurus/linux_standard/lib64/libdisplay_gralloc.z.so"
     }
     subsystem_name = "hdf"
   }
 
   ohos_prebuilt_shared_library("display_gfx") {
-    if (use_musl) {
-      if (target_cpu == "arm") {
-        source = "hispark_taurus/llvm/linux_standard/lib/libdisplay_gfx.z.so"
-      } else {
-        source = "hispark_taurus/llvm/linux_standard/lib64/libdisplay_gfx.z.so"
-      }
+    if (target_cpu == "arm") {
+      source = "hispark_taurus/linux_standard/lib/libdisplay_gfx.z.so"
     } else {
-      source = "hispark_taurus/ext/libdisplay_gfx.z.so"
+      source = "hispark_taurus/linux_standard/lib64/libdisplay_gfx.z.so"
     }
     subsystem_name = "hdf"
   }
 
   ohos_prebuilt_shared_library("display_layer") {
-    if (use_musl) {
-      if (target_cpu == "arm") {
-        source = "hispark_taurus/llvm/linux_standard/lib/libdisplay_layer.z.so"
-      } else {
-        source =
-            "hispark_taurus/llvm/linux_standard/lib64/libdisplay_layer.z.so"
-      }
+    if (target_cpu == "arm") {
+      source = "hispark_taurus/linux_standard/lib/libdisplay_layer.z.so"
     } else {
-      source = "hispark_taurus/ext/libdisplay_layer.z.so"
+      source =
+          "hispark_taurus/linux_standard/lib64/libdisplay_layer.z.so"
     }
     subsystem_name = "hdf"
   }
 
   ohos_prebuilt_shared_library("display_device_drm") {
-    if (use_musl) {
-      if (target_cpu == "arm") {
-        source =
-            "hispark_taurus/llvm/linux_standard/lib/libdisplay_device_drm.z.so"
-      } else {
-        source = "hispark_taurus/llvm/linux_standard/lib64/libdisplay_device_drm.z.so"
-      }
+    if (target_cpu == "arm") {
+      source =
+          "hispark_taurus/linux_standard/lib/libdisplay_device_drm.z.so"
+    } else {
+      source = "hispark_taurus/linux_standard/lib64/libdisplay_device_drm.z.so"
     }
     subsystem_name = "hdf"
   }
-- 
Gitee