From f675a3200073ca5b4274cb1985268c734b00ca55 Mon Sep 17 00:00:00 2001
From: zhang-daiyue <zhangdaiyue1@huawei.com>
Date: Thu, 15 May 2025 22:44:03 +0800
Subject: [PATCH] Independent compile modify

Change-Id: I28a54351d01df4d988d9e8f8b3e929dd9d306910
---
 BUILD.gn    | 11 +++--------
 bundle.json |  6 +++---
 guid.h      |  2 +-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index c2fac18..796246a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -9,11 +9,6 @@ import("//build/ohos.gni")
 import("//build/ohos/ndk/ndk.gni")
 
 config("gptdisk_config") {
-  include_dirs = [
-    ".",
-    "//third_party/e2fsprogs/e2fsprogs/lib/",
-    "//third_party/popt/",
-  ]
   cflags_cc = [
     "-Wall",
     "-D_FILE_OFFSET_BITS=64",
@@ -44,9 +39,9 @@ ohos_executable("sgdisk") {
     "support.cc",
   ]
   public_configs = [ ":gptdisk_config" ]
-  deps = [
-    "//third_party/e2fsprogs:libext2_uuid",
-    "//third_party/popt:popt_static",
+  external_deps = [
+    "e2fsprogs:libext2_uuid",
+    "popt:popt_static",
   ]
   subsystem_name = "thirdparty"
   part_name = "gptfdisk"
diff --git a/bundle.json b/bundle.json
index 05dcf36..7125b0c 100644
--- a/bundle.json
+++ b/bundle.json
@@ -24,11 +24,11 @@
         "rom": "",
         "ram": "",
         "deps": {
-            "components": [],
-            "third_party": [
+            "components": [
                 "e2fsprogs",
                 "popt"
-            ]
+            ],
+            "third_party": []
         },
         "build": {
             "sub_component": [],
diff --git a/guid.h b/guid.h
index 515a75d..717044d 100644
--- a/guid.h
+++ b/guid.h
@@ -26,7 +26,7 @@
    #endif
 typedef unsigned char my_uuid_t[16];
 #else // Not Windows
-#include <uuid/uuid.h>
+#include "uuid.h"
 typedef uuid_t my_uuid_t;
 #endif
 
-- 
Gitee