From 79869e22f2a584165e97851b718b064ff83774a2 Mon Sep 17 00:00:00 2001 From: z30034863 Date: Tue, 2 Sep 2025 16:09:22 +0800 Subject: [PATCH] fix prebuilts_packing_tool/dependency.xml Signed-off-by: z30034863 --- BUILD.gn | 6 +++--- build.py | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 29e3d6bb..8659837e 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -60,18 +60,18 @@ ohos_prebuilt_etc("app_check_tool") { } ohos_prebuilt_etc("fastjson-2.0.52") { - source = "//prebuilts/packing_tool/fastjson2mid/fastjson-2.0.52.jar" + source = "//prebuilts/packing_tool/packing_tool_libs_20250826/fastjson2/fastjson-2.0.52.jar" install_enable = false } ohos_prebuilt_etc("fastjson2-2.0.52") { - source = "//prebuilts/packing_tool/fastjson2/fastjson2-2.0.52.jar" + source = "//prebuilts/packing_tool/packing_tool_libs_20250826/fastjson2/fastjson2-2.0.52.jar" install_enable = false } ohos_prebuilt_etc("fastjson2-extension-2.0.52") { source = - "//prebuilts/packing_tool/fastjson2ext/fastjson2-extension-2.0.52.jar" + "//prebuilts/packing_tool/packing_tool_libs_20250826/fastjson2/fastjson2-extension-2.0.52.jar" install_enable = false } diff --git a/build.py b/build.py index 2ebe3682..5c5b2252 100755 --- a/build.py +++ b/build.py @@ -198,12 +198,12 @@ def main(): toolchain = tool_list[-1] toolchain += "_" + args.compileTarget - fastjson_jar = os.path.join(root_dir, '../../prebuilts/packing_tool/fastjson2mid/fastjson-2.0.52.jar') - fastjson2_jar = os.path.join(root_dir, '../../prebuilts/packing_tool/fastjson2/fastjson2-2.0.52.jar') - fastjson2ext_jar = os.path.join(root_dir, '../../prebuilts/packing_tool/fastjson2ext/fastjson2-extension-2.0.52.jar') - compress_jar = os.path.join(root_dir, '../../prebuilts/packing_tool/compress/commons-compress-1.26.1.jar') + fastjson_jar = os.path.join(root_dir, '../../prebuilts/packing_tool/packing_tool_libs_20250826/fastjson2/fastjson-2.0.52.jar') + fastjson2_jar = os.path.join(root_dir, '../../prebuilts/packing_tool/packing_tool_libs_20250826/fastjson2/fastjson2-2.0.52.jar') + fastjson2ext_jar = os.path.join(root_dir, '../../prebuilts/packing_tool/packing_tool_libs_20250826/fastjson2/fastjson2-extension-2.0.52.jar') + compress_jar = os.path.join(root_dir, '../../prebuilts/packing_tool/packing_tool_libs_20250826/compress/commons-compress-1.26.1.jar') io_jar = os.path.join(root_dir, - '../../prebuilts/packing_tool/io/commons-io-2.15.1-bin/commons-io-2.15.1/commons-io-2.15.1.jar') + '../../prebuilts/packing_tool/packing_tool_libs_20250826/io/commons-io-2.15.1-bin/commons-io-2.15.1/commons-io-2.15.1.jar') print('packingTool: ', toolchain, fastjson_jar, compress_jar, io_jar, fastjson2_jar, fastjson2ext_jar) # compile haptobin_tool.jar -- Gitee