diff --git a/ace_config.gni b/ace_config.gni index 85f28022bbb1c7e718614bf88e0643505aecee60..5722d34da1f2c0ea143fab3d5dcbf1a6ed844706 100644 --- a/ace_config.gni +++ b/ace_config.gni @@ -38,7 +38,7 @@ if (!defined(aosp_libs_dir)) { } libs_root = "${aosp_libs_dir}/sdk" -ace_flutter_engine_root = "$ace_root/build/third_party/flutter" +ace_flutter_engine_root = "$ace_root/build/external_config/flutter" flutter_root = "//third_party/flutter" v8_root = "//third_party/v8" ark_tools_root = "//prebuilts/ace-toolkit/ace-loader/panda" diff --git a/build/third_party/cJSON/BUILD.gn b/build/external_config/cJSON/BUILD.gn similarity index 100% rename from build/third_party/cJSON/BUILD.gn rename to build/external_config/cJSON/BUILD.gn diff --git a/build/third_party/expat/BUILD.gn b/build/external_config/expat/BUILD.gn similarity index 100% rename from build/third_party/expat/BUILD.gn rename to build/external_config/expat/BUILD.gn diff --git a/build/third_party/flutter/BUILD.gn b/build/external_config/flutter/BUILD.gn similarity index 100% rename from build/third_party/flutter/BUILD.gn rename to build/external_config/flutter/BUILD.gn diff --git a/build/third_party/flutter/freetype/BUILD.gn b/build/external_config/flutter/freetype/BUILD.gn similarity index 100% rename from build/third_party/flutter/freetype/BUILD.gn rename to build/external_config/flutter/freetype/BUILD.gn diff --git a/build/third_party/flutter/glfw/BUILD.gn b/build/external_config/flutter/glfw/BUILD.gn similarity index 100% rename from build/third_party/flutter/glfw/BUILD.gn rename to build/external_config/flutter/glfw/BUILD.gn diff --git a/build/third_party/flutter/harfbuzz/BUILD.gn b/build/external_config/flutter/harfbuzz/BUILD.gn similarity index 100% rename from build/third_party/flutter/harfbuzz/BUILD.gn rename to build/external_config/flutter/harfbuzz/BUILD.gn diff --git a/build/third_party/flutter/icu/BUILD.gn b/build/external_config/flutter/icu/BUILD.gn similarity index 100% rename from build/third_party/flutter/icu/BUILD.gn rename to build/external_config/flutter/icu/BUILD.gn diff --git a/build/third_party/flutter/libjpeg/BUILD.gn b/build/external_config/flutter/libjpeg/BUILD.gn similarity index 100% rename from build/third_party/flutter/libjpeg/BUILD.gn rename to build/external_config/flutter/libjpeg/BUILD.gn diff --git a/build/third_party/flutter/libpng/BUILD.gn b/build/external_config/flutter/libpng/BUILD.gn similarity index 100% rename from build/third_party/flutter/libpng/BUILD.gn rename to build/external_config/flutter/libpng/BUILD.gn diff --git a/build/third_party/flutter/libtxt/BUILD.gn b/build/external_config/flutter/libtxt/BUILD.gn similarity index 100% rename from build/third_party/flutter/libtxt/BUILD.gn rename to build/external_config/flutter/libtxt/BUILD.gn diff --git a/build/third_party/flutter/libwebp/BUILD.gn b/build/external_config/flutter/libwebp/BUILD.gn similarity index 100% rename from build/third_party/flutter/libwebp/BUILD.gn rename to build/external_config/flutter/libwebp/BUILD.gn diff --git a/build/third_party/flutter/ohos_layers/BUILD.gn b/build/external_config/flutter/ohos_layers/BUILD.gn similarity index 100% rename from build/third_party/flutter/ohos_layers/BUILD.gn rename to build/external_config/flutter/ohos_layers/BUILD.gn diff --git a/build/third_party/flutter/sfntly/BUILD.gn b/build/external_config/flutter/sfntly/BUILD.gn similarity index 100% rename from build/third_party/flutter/sfntly/BUILD.gn rename to build/external_config/flutter/sfntly/BUILD.gn diff --git a/build/third_party/flutter/skia/BUILD.gn b/build/external_config/flutter/skia/BUILD.gn similarity index 99% rename from build/third_party/flutter/skia/BUILD.gn rename to build/external_config/flutter/skia/BUILD.gn index 8d330d1af181084913087467bef5041fad2dbcfa..d9835f9f26f69ac72c6dff75eb1966be4f528b4f 100644 --- a/build/third_party/flutter/skia/BUILD.gn +++ b/build/external_config/flutter/skia/BUILD.gn @@ -1557,7 +1557,7 @@ ohos_source_set("ace_xml") { "$flutter_root/skia/src/xml/SkXMLWriter.cpp", ] - deps = [ "$ace_root/build/third_party/expat:ace_libexpat" ] + deps = [ "$ace_root/build/external_config/expat:ace_libexpat" ] } # ------------------------------------------------ @@ -1611,7 +1611,7 @@ template("ace_fontmgr") { "$flutter_root/skia/src/ports/SkScalerContext_win_dw.cpp", "$flutter_root/skia/src/ports/SkTypeface_win_dw.cpp", ] - deps = [ "$ace_root/build/third_party/expat:ace_libexpat" ] + deps = [ "$ace_root/build/external_config/expat:ace_libexpat" ] libs = [ "//prebuilts/mingw-w64/ohos/linux-x86_64/clang-mingw/x86_64-w64-mingw32/lib/libgdi32.a", @@ -1638,7 +1638,7 @@ template("ace_fontmgr") { if (platform == "ohos") { sources += [ "$flutter_root/skia/src/ports/SkFontMgr_ohos.cpp" ] } - deps = [ "$ace_root/build/third_party/expat:ace_libexpat" ] + deps = [ "$ace_root/build/external_config/expat:ace_libexpat" ] } } } @@ -1702,7 +1702,7 @@ ohos_source_set("ace_fontmgr_standard") { deps = [ ":ace_fontconfig.json", - "$ace_root/build/third_party/jsoncpp:ace_jsoncpp", + "$ace_root/build/external_config/jsoncpp:ace_jsoncpp", ] # Only standard system has ohos_fonts source diff --git a/build/third_party/flutter/skia/make_skia_include_dir.py b/build/external_config/flutter/skia/make_skia_include_dir.py similarity index 100% rename from build/third_party/flutter/skia/make_skia_include_dir.py rename to build/external_config/flutter/skia/make_skia_include_dir.py diff --git a/build/third_party/jsoncpp/BUILD.gn b/build/external_config/jsoncpp/BUILD.gn similarity index 100% rename from build/third_party/jsoncpp/BUILD.gn rename to build/external_config/jsoncpp/BUILD.gn diff --git a/frameworks/base/BUILD.gn b/frameworks/base/BUILD.gn index 66a9c74933195c32e9d84152bf34ab5c60c3756b..81e3bd91da583e72cda9089f18bf300e2c22b762 100644 --- a/frameworks/base/BUILD.gn +++ b/frameworks/base/BUILD.gn @@ -20,7 +20,7 @@ template("ace_base_source_set") { ohos_source_set(target_name) { defines += invoker.defines deps = [ - "$ace_root/build/third_party/cJSON:third_party_cjson", + "$ace_root/build/external_config/cJSON:third_party_cjson", "i18n:ace_base_i18n_$platform", "resource:ace_resource", ] diff --git a/frameworks/core/animation/test/unittest/framework/BUILD.gn b/frameworks/core/animation/test/unittest/framework/BUILD.gn index db614116bc25e0b8f08c7bcfddd452f35802ad35..8f0ae994d50cbdd0dbbb09830fd35fbc08e58d0a 100644 --- a/frameworks/core/animation/test/unittest/framework/BUILD.gn +++ b/frameworks/core/animation/test/unittest/framework/BUILD.gn @@ -206,7 +206,7 @@ ohos_unittest("AnimationTest") { deps = [ "$ace_flutter_engine_root/skia:ace_skia_ohos", - "$ace_root/build/third_party/cJSON:third_party_cjson", + "$ace_root/build/external_config/cJSON:third_party_cjson", "$ace_root/frameworks/core/components/theme:build_theme_code", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/frameworks/core/animation/test/unittest/spring_chain/BUILD.gn b/frameworks/core/animation/test/unittest/spring_chain/BUILD.gn index 64da370aa7192efb6b366b5870bcd14d5802a1c5..ca5222a37aa9f8dc8a97ce3b436c5e1390b42a08 100644 --- a/frameworks/core/animation/test/unittest/spring_chain/BUILD.gn +++ b/frameworks/core/animation/test/unittest/spring_chain/BUILD.gn @@ -209,7 +209,7 @@ ohos_unittest("SpringChainTest") { deps = [ "$ace_flutter_engine_root/skia:ace_skia_ohos", - "$ace_root/build/third_party/cJSON:third_party_cjson", + "$ace_root/build/external_config/cJSON:third_party_cjson", "$ace_root/frameworks/core/components/theme:build_theme_code", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/frameworks/core/animation/test/unittest/svg_animate/BUILD.gn b/frameworks/core/animation/test/unittest/svg_animate/BUILD.gn index 52e82206201c3bcc4d32389374fb5b3a559ee643..c62b52b24001ed35f8329206c0d191101aa7c1af 100644 --- a/frameworks/core/animation/test/unittest/svg_animate/BUILD.gn +++ b/frameworks/core/animation/test/unittest/svg_animate/BUILD.gn @@ -209,7 +209,7 @@ ohos_unittest("SvgAnimateTest") { deps = [ "$ace_flutter_engine_root/skia:ace_skia_ohos", - "$ace_root/build/third_party/cJSON:third_party_cjson", + "$ace_root/build/external_config/cJSON:third_party_cjson", "$ace_root/frameworks/core/components/theme:build_theme_code", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/frameworks/core/components/test/unittest/checkable/BUILD.gn b/frameworks/core/components/test/unittest/checkable/BUILD.gn index f832efc53d3d0c4d99921ad10b04a87ffd8d5e5d..b80241fec6f6c0bd00052a72b692434b86dd66e7 100644 --- a/frameworks/core/components/test/unittest/checkable/BUILD.gn +++ b/frameworks/core/components/test/unittest/checkable/BUILD.gn @@ -250,7 +250,7 @@ ohos_unittest("CheckableComponentTest") { deps = [ "$ace_flutter_engine_root:third_party_flutter_engine_ohos", "$ace_flutter_engine_root/skia:ace_skia_ohos", - "$ace_root/build/third_party/cJSON:third_party_cjson", + "$ace_root/build/external_config/cJSON:third_party_cjson", "$ace_root/frameworks/core/components/theme:build_theme_code", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/frameworks/core/components/test/unittest/image/BUILD.gn b/frameworks/core/components/test/unittest/image/BUILD.gn index 9bcbaa18f4e77d0cc45b82ca46255c8aea5ab2d9..63cbfd558ce759763110dfb246b0edc57061b2bd 100644 --- a/frameworks/core/components/test/unittest/image/BUILD.gn +++ b/frameworks/core/components/test/unittest/image/BUILD.gn @@ -195,7 +195,7 @@ ohos_unittest("RenderImageTest") { deps = [ "$ace_flutter_engine_root/skia:ace_skia_ohos", - "$ace_root/build/third_party/cJSON:third_party_cjson", + "$ace_root/build/external_config/cJSON:third_party_cjson", "$ace_root/frameworks/core/components/theme:build_theme_code", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/frameworks/core/components/test/unittest/image_animator/BUILD.gn b/frameworks/core/components/test/unittest/image_animator/BUILD.gn index 9a84f7db90e894192c204e5615ace1a915be5120..2408c41ef8a3a889e4161f6f9393b99aed9c2333 100644 --- a/frameworks/core/components/test/unittest/image_animator/BUILD.gn +++ b/frameworks/core/components/test/unittest/image_animator/BUILD.gn @@ -219,7 +219,7 @@ ohos_unittest("ImageAnimatorElementTest") { deps = [ "$ace_flutter_engine_root/skia:ace_skia_ohos", - "$ace_root/build/third_party/cJSON:third_party_cjson", + "$ace_root/build/external_config/cJSON:third_party_cjson", "$ace_root/frameworks/core/components/theme:build_theme_code", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/frameworks/core/components/test/unittest/marquee/BUILD.gn b/frameworks/core/components/test/unittest/marquee/BUILD.gn index cb6bf13db94451f89da6b55aa9a5e88fa4e6b520..a9cfe0197f01fbafbd135d88d773e21b66ce8d99 100644 --- a/frameworks/core/components/test/unittest/marquee/BUILD.gn +++ b/frameworks/core/components/test/unittest/marquee/BUILD.gn @@ -236,7 +236,7 @@ ohos_unittest("RenderMarqueeTest") { deps = [ "$ace_flutter_engine_root/skia:ace_skia_ohos", - "$ace_root/build/third_party/cJSON:third_party_cjson", + "$ace_root/build/external_config/cJSON:third_party_cjson", "$ace_root/frameworks/core/components/theme:build_theme_code", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/frameworks/core/components/test/unittest/rating/BUILD.gn b/frameworks/core/components/test/unittest/rating/BUILD.gn index b04dba48eb49dd30c3172840ef0088425c86310b..2966073ba6121930f74ca79fb18c336af0dfbd13 100644 --- a/frameworks/core/components/test/unittest/rating/BUILD.gn +++ b/frameworks/core/components/test/unittest/rating/BUILD.gn @@ -229,7 +229,7 @@ ohos_unittest("RatingComponentTest") { deps = [ "$ace_flutter_engine_root/skia:ace_skia_ohos", "$ace_root/adapter/ohos/osal:ace_osal_ohos", - "$ace_root/build/third_party/cJSON:third_party_cjson", + "$ace_root/build/external_config/cJSON:third_party_cjson", "$ace_root/frameworks/core/components/theme:build_theme_code", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/frameworks/core/components/test/unittest/semimodal/BUILD.gn b/frameworks/core/components/test/unittest/semimodal/BUILD.gn index a0441ecd4cd652882fc3e00931a1873d547ef634..3bad38b258c9231215472c26aadd3a6f14ae0efc 100644 --- a/frameworks/core/components/test/unittest/semimodal/BUILD.gn +++ b/frameworks/core/components/test/unittest/semimodal/BUILD.gn @@ -222,7 +222,7 @@ ohos_unittest("RenderSemiModalTest") { deps = [ "$ace_flutter_engine_root/skia:ace_skia_ohos", - "$ace_root/build/third_party/cJSON:third_party_cjson", + "$ace_root/build/external_config/cJSON:third_party_cjson", "$ace_root/frameworks/base/resource:ace_resource", "$ace_root/frameworks/core/components/theme:build_theme_code", "//third_party/googletest:gtest_main", diff --git a/frameworks/core/components/test/unittest/swiper/BUILD.gn b/frameworks/core/components/test/unittest/swiper/BUILD.gn index fbd44f14a9b3e0f94ea043a20f2d0deae6d7d455..4e1c2cd0bbca9b478881c6a10ac0410025993908 100644 --- a/frameworks/core/components/test/unittest/swiper/BUILD.gn +++ b/frameworks/core/components/test/unittest/swiper/BUILD.gn @@ -239,7 +239,7 @@ ohos_unittest("SwiperComponentTest") { deps = [ "$ace_flutter_engine_root/skia:ace_skia_ohos", - "$ace_root/build/third_party/cJSON:third_party_cjson", + "$ace_root/build/external_config/cJSON:third_party_cjson", "$ace_root/frameworks/core/components/theme:build_theme_code", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/frameworks/core/components/test/unittest/theme/BUILD.gn b/frameworks/core/components/test/unittest/theme/BUILD.gn index 3f80e7686eb48b6296ee4625b8d72e1703e03a88..94291d728ee2fdd9040f389de7125095a3f9ea87 100644 --- a/frameworks/core/components/test/unittest/theme/BUILD.gn +++ b/frameworks/core/components/test/unittest/theme/BUILD.gn @@ -179,7 +179,7 @@ ohos_unittest("ThemeConstantsTest") { ] deps = [ - "$ace_root/build/third_party/cJSON:third_party_cjson", + "$ace_root/build/external_config/cJSON:third_party_cjson", "$ace_root/frameworks/core/components/theme:build_theme_code", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/frameworks/core/components/test/unittest/transition/BUILD.gn b/frameworks/core/components/test/unittest/transition/BUILD.gn index 34ca00ca3354263d20fd07b6051bd24b7e0ffdb2..b36bfc651b44e50484e7e1dd5373f2586babc0a8 100644 --- a/frameworks/core/components/test/unittest/transition/BUILD.gn +++ b/frameworks/core/components/test/unittest/transition/BUILD.gn @@ -225,7 +225,7 @@ ohos_unittest("TransitionElementTest") { deps = [ "$ace_flutter_engine_root/skia:ace_skia_ohos", - "$ace_root/build/third_party/cJSON:third_party_cjson", + "$ace_root/build/external_config/cJSON:third_party_cjson", "$ace_root/frameworks/core/components/theme:build_theme_code", "//third_party/googletest:gtest_main", "//third_party/zlib:libz", @@ -290,7 +290,7 @@ ohos_unittest("SharedTransitionElementTest") { deps = [ "$ace_flutter_engine_root/skia:ace_skia_ohos", - "$ace_root/build/third_party/cJSON:third_party_cjson", + "$ace_root/build/external_config/cJSON:third_party_cjson", "$ace_root/frameworks/core/components/theme:build_theme_code", "//third_party/googletest:gtest_main", "//third_party/zlib:libz", @@ -350,7 +350,7 @@ ohos_unittest("TransitionPropertyElementTest") { deps = [ "$ace_flutter_engine_root/skia:ace_skia_ohos", - "$ace_root/build/third_party/cJSON:third_party_cjson", + "$ace_root/build/external_config/cJSON:third_party_cjson", "$ace_root/frameworks/core/components/theme:build_theme_code", "//third_party/googletest:gtest_main", "//third_party/zlib:libz", diff --git a/frameworks/core/components/test/unittest/tween/BUILD.gn b/frameworks/core/components/test/unittest/tween/BUILD.gn index 39846881393cdc89089a01a715d02295dd94462a..6fcd1a90679a396821e58705d99d494079582f79 100644 --- a/frameworks/core/components/test/unittest/tween/BUILD.gn +++ b/frameworks/core/components/test/unittest/tween/BUILD.gn @@ -208,7 +208,7 @@ ohos_unittest("TweenElementTest") { deps = [ "$ace_flutter_engine_root/skia:ace_skia_ohos", - "$ace_root/build/third_party/cJSON:third_party_cjson", + "$ace_root/build/external_config/cJSON:third_party_cjson", "$ace_root/frameworks/core/components/theme:build_theme_code", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/frameworks/core/focus/test/unittest/focus/BUILD.gn b/frameworks/core/focus/test/unittest/focus/BUILD.gn index 664388d5c5376159746d89330f22e1a9af594cea..509913af941aee3785c5a4656af179d7202f4083 100644 --- a/frameworks/core/focus/test/unittest/focus/BUILD.gn +++ b/frameworks/core/focus/test/unittest/focus/BUILD.gn @@ -76,7 +76,7 @@ ohos_unittest("FocusTest") { ] deps = [ - "$ace_root/build/third_party/cJSON:third_party_cjson", + "$ace_root/build/external_config/cJSON:third_party_cjson", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] diff --git a/frameworks/core/pipeline/test/unittest/context/BUILD.gn b/frameworks/core/pipeline/test/unittest/context/BUILD.gn index 364dc72667935e3372479f6c113fd3ff199b9b16..62230200c4b4cf728c4b21dfb1599e402e0e2c4a 100644 --- a/frameworks/core/pipeline/test/unittest/context/BUILD.gn +++ b/frameworks/core/pipeline/test/unittest/context/BUILD.gn @@ -194,7 +194,7 @@ ohos_unittest("PipelineContextTest") { "$ace_flutter_engine_root:third_party_flutter_engine_ohos", "$ace_flutter_engine_root/icu:ace_libicu_ohos", "$ace_flutter_engine_root/skia:ace_skia_ohos", - "$ace_root/build/third_party/cJSON:third_party_cjson", + "$ace_root/build/external_config/cJSON:third_party_cjson", "$ace_root/frameworks/base/resource:ace_resource", "$ace_root/frameworks/core/components/theme:build_theme_code", "//third_party/googletest:gtest_main",