From de98c837208c022f70028169162b0418fc6992eb Mon Sep 17 00:00:00 2001
From: Alexander Frick <Alex313031@gmail.com>
Date: Fri, 12 Jan 2024 12:35:17 -0600
Subject: [PATCH]  arm fixes

---
 arm/raspi/{build => build_old}/config/arm.gni           | 0
 arm/raspi/{build => build_old}/config/compiler/BUILD.gn | 0
 arm/setup_arm.sh                                        | 6 ++++--
 {src => arm}/third_party/libaom/BUILD.gn                | 0
 {src => arm}/third_party/libaom/cmake_update.sh         | 0
 infra/set_exec.sh                                       | 2 ++
 setup.sh                                                | 7 ++++++-
 7 files changed, 12 insertions(+), 3 deletions(-)
 rename arm/raspi/{build => build_old}/config/arm.gni (100%)
 rename arm/raspi/{build => build_old}/config/compiler/BUILD.gn (100%)
 mode change 100644 => 100755 arm/setup_arm.sh
 rename {src => arm}/third_party/libaom/BUILD.gn (100%)
 rename {src => arm}/third_party/libaom/cmake_update.sh (100%)

diff --git a/arm/raspi/build/config/arm.gni b/arm/raspi/build_old/config/arm.gni
similarity index 100%
rename from arm/raspi/build/config/arm.gni
rename to arm/raspi/build_old/config/arm.gni
diff --git a/arm/raspi/build/config/compiler/BUILD.gn b/arm/raspi/build_old/config/compiler/BUILD.gn
similarity index 100%
rename from arm/raspi/build/config/compiler/BUILD.gn
rename to arm/raspi/build_old/config/compiler/BUILD.gn
diff --git a/arm/setup_arm.sh b/arm/setup_arm.sh
old mode 100644
new mode 100755
index 43494e1d..f7a6ed12
--- a/arm/setup_arm.sh
+++ b/arm/setup_arm.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2022 Alex313031.
+# Copyright (c) 2024 Alex313031.
 
 YEL='\033[1;33m' # Yellow
 RED='\033[1;31m' # Red
@@ -35,7 +35,9 @@ printf "\n" &&
 printf "${YEL}Copying BUILD.gn...\n" &&
 tput sgr0 &&
 
-cp -r -v ./config/* $HOME/chromium/src/build/config/ &&
+cp -r -v ./build/* $HOME/chromium/src/build/ &&
+cp -r -v ./media/* $HOME/chromium/src/media/ &&
+cp -r -v ./third_party/* $HOME/chromium/src/third_party/ &&
 
 printf "${GRE}Done!\n" &&
 printf "\n" &&
diff --git a/src/third_party/libaom/BUILD.gn b/arm/third_party/libaom/BUILD.gn
similarity index 100%
rename from src/third_party/libaom/BUILD.gn
rename to arm/third_party/libaom/BUILD.gn
diff --git a/src/third_party/libaom/cmake_update.sh b/arm/third_party/libaom/cmake_update.sh
similarity index 100%
rename from src/third_party/libaom/cmake_update.sh
rename to arm/third_party/libaom/cmake_update.sh
diff --git a/infra/set_exec.sh b/infra/set_exec.sh
index c11e250e..054eb574 100755
--- a/infra/set_exec.sh
+++ b/infra/set_exec.sh
@@ -95,6 +95,8 @@ sudo chmod -v +x pak_src/build.sh &&
 
 sudo chmod -v +x src/build/vs_toolchain.py &&
 
+sudo chmod -v +x arm/setup_arm.sh &&
+
 # sudo chmod -v +x src/tools/gn/bootstrap/bootstrap.py &&
 
 sudo chmod -v +x src/tools/clang/scripts/build.py &&
diff --git a/setup.sh b/setup.sh
index 5fb000a7..24265cfd 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2023 Alex313031.
+# Copyright (c) 2024 Alex313031.
 
 YEL='\033[1;33m' # Yellow
 CYA='\033[1;96m' # Cyan
@@ -82,6 +82,7 @@ copyMacOS () {
 	printf "\n" &&
 	printf "${YEL}Copying files for MacOS...${c0}\n" &&
 	cp -r -v arm/mac_arm.gni ${CR_SRC_DIR}/build/config/arm.gni &&
+	cp -r -v arm/third_party/* ${CR_SRC_DIR}/third_party/ &&
 	printf "\n"
 }
 case $1 in
@@ -93,6 +94,7 @@ copyRaspi () {
 	printf "\n" &&
 	printf "${YEL}Copying Raspberry Pi build files...${c0}\n" &&
 	cp -r -v arm/media/* ${CR_SRC_DIR}/media/ &&
+	cp -r -v arm/third_party/* ${CR_SRC_DIR}/third_party/ &&
 	cp -r -v arm/raspi/* ${CR_SRC_DIR}/ &&
 	rm -v ${CR_SRC_DIR}/out/thorium/pak &&
 	cp -v pak_src/binaries/pak_arm64 ${CR_SRC_DIR}/out/thorium/pak &&
@@ -112,6 +114,7 @@ copyWOA () {
 	printf "\n" &&
 	printf "${YEL}Copying Windows on ARM build files...${c0}\n" &&
 	cp -r -v arm/build/config/* ${CR_SRC_DIR}/build/config/ &&
+	cp -r -v arm/third_party/* ${CR_SRC_DIR}/third_party/ &&
 	printf "\n"
 }
 case $1 in
@@ -165,6 +168,7 @@ copyAndroid () {
 	cp -r -v arm/media/* ${CR_SRC_DIR}/media/ &&
 	cp -r -v arm/android/* ${CR_SRC_DIR}/ &&
 	cp -r -v arm/android/third_party/* ${CR_SRC_DIR}/third_party/ &&
+	cp -r -v arm/third_party/* ${CR_SRC_DIR}/third_party/ &&
 	rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_base/drawable-v26/ic_launcher.xml &&
 	rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_base/drawable-v26/ic_launcher_round.xml &&
 	rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_chromium_base/mipmap-mdpi/layered_app_icon_background.png &&
@@ -178,6 +182,7 @@ copyAndroid () {
 	rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_chromium_base/mipmap-hdpi/layered_app_icon.png &&
 	rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_chromium_base/mipmap-xxhdpi/layered_app_icon_background.png &&
 	rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_chromium_base/mipmap-xxhdpi/layered_app_icon.png &&
+	. ./infra/fix_libaom.sh &&
 	printf "\n"
 }
 case $1 in