diff --git a/BUILD.gn b/BUILD.gn index c2fac18c95e7ec4d7f20afcb73b76ef9236c3069..796246a5972f657ee43b7f65ceb98edcf641e287 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 05dcf368a9ba5dbfa3a8f0f576ee97f1a68b2290..7125b0c9bf80ce2d17f7a20148c1dbe51913a575 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 515a75d1b1b52b893b091c51da669070f1bbd537..717044d7521085be515feea75ea605d6bcd674a6 100644 --- a/guid.h +++ b/guid.h @@ -26,7 +26,7 @@ #endif typedef unsigned char my_uuid_t[16]; #else // Not Windows -#include +#include "uuid.h" typedef uuid_t my_uuid_t; #endif