From 07dfa13e589dc92db48d2c3721b1df6c2a9bce90 Mon Sep 17 00:00:00 2001 From: lushi Date: Mon, 22 Nov 2021 16:27:56 +0800 Subject: [PATCH] rename build/third_party as build/external_config Signed-off-by: lushi Change-Id: I9e05fd8bbfd57afe4f2388a7faa7e4064532dda6 --- ace_config.gni | 2 +- build/{third_party => external_config}/cJSON/BUILD.gn | 0 build/{third_party => external_config}/expat/BUILD.gn | 0 build/{third_party => external_config}/flutter/BUILD.gn | 0 .../flutter/freetype/BUILD.gn | 0 .../flutter/glfw/BUILD.gn | 0 .../flutter/harfbuzz/BUILD.gn | 0 .../{third_party => external_config}/flutter/icu/BUILD.gn | 0 .../flutter/libjpeg/BUILD.gn | 0 .../flutter/libpng/BUILD.gn | 0 .../flutter/libtxt/BUILD.gn | 0 .../flutter/libwebp/BUILD.gn | 0 .../flutter/ohos_layers/BUILD.gn | 0 .../flutter/sfntly/BUILD.gn | 0 .../flutter/skia/BUILD.gn | 8 ++++---- .../flutter/skia/make_skia_include_dir.py | 0 build/{third_party => external_config}/jsoncpp/BUILD.gn | 0 frameworks/base/BUILD.gn | 2 +- .../core/animation/test/unittest/framework/BUILD.gn | 2 +- .../core/animation/test/unittest/spring_chain/BUILD.gn | 2 +- .../core/animation/test/unittest/svg_animate/BUILD.gn | 2 +- .../core/components/test/unittest/checkable/BUILD.gn | 2 +- frameworks/core/components/test/unittest/image/BUILD.gn | 2 +- .../core/components/test/unittest/image_animator/BUILD.gn | 2 +- frameworks/core/components/test/unittest/marquee/BUILD.gn | 2 +- frameworks/core/components/test/unittest/rating/BUILD.gn | 2 +- .../core/components/test/unittest/semimodal/BUILD.gn | 2 +- frameworks/core/components/test/unittest/swiper/BUILD.gn | 2 +- frameworks/core/components/test/unittest/theme/BUILD.gn | 2 +- .../core/components/test/unittest/transition/BUILD.gn | 6 +++--- frameworks/core/components/test/unittest/tween/BUILD.gn | 2 +- frameworks/core/focus/test/unittest/focus/BUILD.gn | 2 +- frameworks/core/pipeline/test/unittest/context/BUILD.gn | 2 +- 33 files changed, 23 insertions(+), 23 deletions(-) rename build/{third_party => external_config}/cJSON/BUILD.gn (100%) rename build/{third_party => external_config}/expat/BUILD.gn (100%) rename build/{third_party => external_config}/flutter/BUILD.gn (100%) rename build/{third_party => external_config}/flutter/freetype/BUILD.gn (100%) rename build/{third_party => external_config}/flutter/glfw/BUILD.gn (100%) rename build/{third_party => external_config}/flutter/harfbuzz/BUILD.gn (100%) rename build/{third_party => external_config}/flutter/icu/BUILD.gn (100%) rename build/{third_party => external_config}/flutter/libjpeg/BUILD.gn (100%) rename build/{third_party => external_config}/flutter/libpng/BUILD.gn (100%) rename build/{third_party => external_config}/flutter/libtxt/BUILD.gn (100%) rename build/{third_party => external_config}/flutter/libwebp/BUILD.gn (100%) rename build/{third_party => external_config}/flutter/ohos_layers/BUILD.gn (100%) rename build/{third_party => external_config}/flutter/sfntly/BUILD.gn (100%) rename build/{third_party => external_config}/flutter/skia/BUILD.gn (99%) rename build/{third_party => external_config}/flutter/skia/make_skia_include_dir.py (100%) rename build/{third_party => external_config}/jsoncpp/BUILD.gn (100%) diff --git a/ace_config.gni b/ace_config.gni index 85f28022bbb..5722d34da1f 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 8d330d1af18..d9835f9f26f 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 66a9c749331..81e3bd91da5 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 db614116bc2..8f0ae994d50 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 64da370aa71..ca5222a37aa 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 52e82206201..c62b52b2400 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 f832efc53d3..b80241fec6f 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 9bcbaa18f4e..63cbfd558ce 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 9a84f7db90e..2408c41ef8a 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 cb6bf13db94..a9cfe0197f0 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 b04dba48eb4..2966073ba61 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 a0441ecd4cd..3bad38b258c 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 fbd44f14a9b..4e1c2cd0bbc 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 3f80e7686eb..94291d728ee 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 34ca00ca335..b36bfc651b4 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 39846881393..6fcd1a90679 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 664388d5c53..509913af941 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 364dc726679..62230200c4b 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", -- Gitee