From 5e6f84ec74250e5545b76faccf19319d8883a889 Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Mon, 29 May 2023 15:23:11 +0300 Subject: [PATCH 1/3] Add files to docker archive --- Common/3dParty/v8/android/build.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Common/3dParty/v8/android/build.py b/Common/3dParty/v8/android/build.py index 39b6930e7c..14129064c6 100644 --- a/Common/3dParty/v8/android/build.py +++ b/Common/3dParty/v8/android/build.py @@ -145,6 +145,10 @@ def deploy_libs(): copy_file(input_dir + "/icudtl.dat", output_dir + "/icudtl.dat") copy_file(input_dir + "/icudtl_extra.dat", output_dir + "/icudtl_extra.dat") copy_file(input_dir + "/obj/libv8_monolith.a", output_dir + "/libv8_monolith.a") + + create_dir("../build/v8") + copy_dir("./include", "../build/v8/include") + copy_dir("./src", "../build/v8/src") return def make(): From 527af6f6698e458aed8c80f0c4a2439046659342 Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Mon, 29 May 2023 15:49:49 +0300 Subject: [PATCH 2/3] Refactoring android build --- Common/3dParty/v8/android/make.py | 47 ++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/Common/3dParty/v8/android/make.py b/Common/3dParty/v8/android/make.py index 662768e840..8879975b10 100644 --- a/Common/3dParty/v8/android/make.py +++ b/Common/3dParty/v8/android/make.py @@ -3,21 +3,34 @@ sys.path.append('./../../../../../build_tools/scripts') import base import os -if ("linux" == base.host_platform()): - if not base.is_dir("./build"): - base.cmd("python", ["./build.py"]) +def build_func(): + if ("linux" == base.host_platform()): + if not base.is_dir("./build"): + base.cmd("python", ["./build.py"]) -if ("mac" == base.host_platform()): - if not base.is_file("./build.zip"): - base.bash("./run_docker") - if not base.is_dir("./build"): - base.configure_common_apps("./../../../../../build_tools/scripts/base.py") - base.extract("./build.zip", "./") - if not base.is_dir("v8"): - if not base.is_dir("depot_tools"): - base.cmd("git", ["clone", "https://chromium.googlesource.com/chromium/tools/depot_tools.git"]) - old_cur = os.getcwd() - os.environ["PATH"] = old_cur + "/depot_tools" + os.pathsep + os.environ["PATH"] - base.cmd("./depot_tools/fetch", ["v8"], True) - base.cmd("./depot_tools/gclient", ["sync", "-r", "remotes/branch-heads/8.9"], True) - base.cmd("gclient", ["sync", "--force"], True) + if ("mac" == base.host_platform()): + if not base.is_file("./build.zip"): + base.bash("./run_docker") + if not base.is_dir("./build"): + base.configure_common_apps("./../../../../../build_tools/scripts/base.py") + base.extract("./build.zip", "./") + if not base.is_dir("v8"): + if not base.is_dir("depot_tools"): + base.cmd("git", ["clone", "https://chromium.googlesource.com/chromium/tools/depot_tools.git"]) + old_cur = os.getcwd() + os.environ["PATH"] = old_cur + "/depot_tools" + os.pathsep + os.environ["PATH"] + base.cmd("./depot_tools/fetch", ["v8"], True) + base.cmd("./depot_tools/gclient", ["sync", "-r", "remotes/branch-heads/8.9"], True) + base.cmd("gclient", ["sync", "--force"], True) + return + +# build function. for speed we just download the build archive +# archive built with this func +if False: + build_func() +else + if not base.is_file("./build.7z"): + base.download("http://d2ettrnqo7v976.cloudfront.net/v8/android/build.7z", "./build.7z") + base.extract("./build.7z", "./") + base.copy_dir("./build/v8", "./v8") + base.delete_dir("./build/v8") From e41b892b580e686aa72834fce122f9aa2916d10a Mon Sep 17 00:00:00 2001 From: "Oleg.Korshul" Date: Mon, 29 May 2023 18:01:30 +0500 Subject: [PATCH 3/3] Fix typo --- Common/3dParty/v8/android/make.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/3dParty/v8/android/make.py b/Common/3dParty/v8/android/make.py index 8879975b10..f00b3d36e8 100644 --- a/Common/3dParty/v8/android/make.py +++ b/Common/3dParty/v8/android/make.py @@ -28,7 +28,7 @@ def build_func(): # archive built with this func if False: build_func() -else +else: if not base.is_file("./build.7z"): base.download("http://d2ettrnqo7v976.cloudfront.net/v8/android/build.7z", "./build.7z") base.extract("./build.7z", "./")