Loading build.sh +17 −14 Original line number Diff line number Diff line Loading @@ -6,6 +6,8 @@ chromium_dir="${chromium_dir:-/srv/chromium}" root_dir=$(dirname "$(readlink -f "$0")") if [ ! -d "$chromium_dir" ]; then chromium_dir=$root_dir else build_id=$(date +%s) fi date_time=$(date '+%Y%m%d%H%M%S') chromium_version=$(head -n 1 "${root_dir}/bromite/CHANGELOG.md" | sed 's/# \(.*\)/\1/') Loading Loading @@ -54,48 +56,49 @@ build() { build_args+=' android_default_version_name="'$chromium_version'"' build_args+=' android_default_version_code="'$code'"' if [ $clean -eq 1 ] && [ -d "out/$1" ]; then rm -rf "out/$1" if [ $clean -eq 1 ] && [ -d "out/$1*" ]; then rm -rf "out/$1*" fi build_args+=' cc_wrapper="ccache"' echo ">> [$(date)] Building chromium $chromium_version for $1" gn gen "out/$1" --args="$build_args" out_dir="out/${1}$build_id" gn gen "$out_dir" --args="$build_args" if [ $1 '==' "x64" ] || [ $1 '==' "arm64" ]; then ninja -C out/$1 trichrome_webview_32_apk trichrome_chrome_32_apk trichrome_library_32_apk \ ninja -C $out_dir trichrome_webview_32_apk trichrome_chrome_32_apk trichrome_library_32_apk \ trichrome_webview_64_32_apk trichrome_chrome_64_32_apk trichrome_library_64_32_apk \ chrome_public_apk system_webview_apk elif [ $1 '==' "x86" ] || [ $1 '==' "arm" ]; then ninja -C out/$1 chrome_public_apk system_webview_apk ninja -C $out_dir chrome_public_apk system_webview_apk fi for apk in $apks; do if [ -f "out/${1}/apks/$apk.apk" ]; then if [ -f "$out_dir/apks/$apk.apk" ]; then echo ">> [$(date)] Moving $apk for ${1} to output folder" if [[ "$apk.apk" == ChromePublic.apk ]]; then if [ "$1" = "x64" ]; then mv "out/${1}/apks/ChromePublic.apk" "${root_dir}/apks/$date_time/x86_64/ChromePublic.apk" mv "$out_dir/apks/ChromePublic.apk" "${root_dir}/apks/$date_time/x86_64/ChromePublic.apk" else mv "out/${1}/apks/ChromePublic.apk" "${root_dir}/apks/$date_time/${1}/ChromePublic.apk" mv "$out_dir/apks/ChromePublic.apk" "${root_dir}/apks/$date_time/${1}/ChromePublic.apk" fi elif [[ "$apk.apk" == SystemWebView.apk ]]; then if [ "$1" = "x64" ]; then mv "out/${1}/apks/SystemWebView.apk" "${root_dir}/apks/$date_time/x86_64/SystemWebView.apk" mv "$out_dir/apks/SystemWebView.apk" "${root_dir}/apks/$date_time/x86_64/SystemWebView.apk" else mv "out/${1}/apks/SystemWebView.apk" "${root_dir}/apks/$date_time/${1}/SystemWebView.apk" mv "$out_dir/apks/SystemWebView.apk" "${root_dir}/apks/$date_time/${1}/SystemWebView.apk" fi elif [[ "$apk.apk" == *6432.apk ]]; then if [ "$1" = "x64" ]; then mv "out/${1}/apks/$apk.apk" "${root_dir}/apks/$date_time/x86_64/${apk::-4}.apk" mv "$out_dir/apks/$apk.apk" "${root_dir}/apks/$date_time/x86_64/${apk::-4}.apk" elif [ "$1" = "arm64" ]; then mv "out/${1}/apks/$apk.apk" "${root_dir}/apks/$date_time/arm64/${apk::-4}.apk" mv "$out_dir/apks/$apk.apk" "${root_dir}/apks/$date_time/arm64/${apk::-4}.apk" fi else if [ "$1" = "x64" ]; then mv "out/${1}/apks/$apk.apk" "${root_dir}/apks/$date_time/x86/${apk::-2}.apk" mv "$out_dir/apks/$apk.apk" "${root_dir}/apks/$date_time/x86/${apk::-2}.apk" elif [ "$1" = "arm64" ]; then mv "out/${1}/apks/$apk.apk" "${root_dir}/apks/$date_time/arm/${apk::-2}.apk" mv "$out_dir/apks/$apk.apk" "${root_dir}/apks/$date_time/arm/${apk::-2}.apk" fi fi fi Loading Loading
build.sh +17 −14 Original line number Diff line number Diff line Loading @@ -6,6 +6,8 @@ chromium_dir="${chromium_dir:-/srv/chromium}" root_dir=$(dirname "$(readlink -f "$0")") if [ ! -d "$chromium_dir" ]; then chromium_dir=$root_dir else build_id=$(date +%s) fi date_time=$(date '+%Y%m%d%H%M%S') chromium_version=$(head -n 1 "${root_dir}/bromite/CHANGELOG.md" | sed 's/# \(.*\)/\1/') Loading Loading @@ -54,48 +56,49 @@ build() { build_args+=' android_default_version_name="'$chromium_version'"' build_args+=' android_default_version_code="'$code'"' if [ $clean -eq 1 ] && [ -d "out/$1" ]; then rm -rf "out/$1" if [ $clean -eq 1 ] && [ -d "out/$1*" ]; then rm -rf "out/$1*" fi build_args+=' cc_wrapper="ccache"' echo ">> [$(date)] Building chromium $chromium_version for $1" gn gen "out/$1" --args="$build_args" out_dir="out/${1}$build_id" gn gen "$out_dir" --args="$build_args" if [ $1 '==' "x64" ] || [ $1 '==' "arm64" ]; then ninja -C out/$1 trichrome_webview_32_apk trichrome_chrome_32_apk trichrome_library_32_apk \ ninja -C $out_dir trichrome_webview_32_apk trichrome_chrome_32_apk trichrome_library_32_apk \ trichrome_webview_64_32_apk trichrome_chrome_64_32_apk trichrome_library_64_32_apk \ chrome_public_apk system_webview_apk elif [ $1 '==' "x86" ] || [ $1 '==' "arm" ]; then ninja -C out/$1 chrome_public_apk system_webview_apk ninja -C $out_dir chrome_public_apk system_webview_apk fi for apk in $apks; do if [ -f "out/${1}/apks/$apk.apk" ]; then if [ -f "$out_dir/apks/$apk.apk" ]; then echo ">> [$(date)] Moving $apk for ${1} to output folder" if [[ "$apk.apk" == ChromePublic.apk ]]; then if [ "$1" = "x64" ]; then mv "out/${1}/apks/ChromePublic.apk" "${root_dir}/apks/$date_time/x86_64/ChromePublic.apk" mv "$out_dir/apks/ChromePublic.apk" "${root_dir}/apks/$date_time/x86_64/ChromePublic.apk" else mv "out/${1}/apks/ChromePublic.apk" "${root_dir}/apks/$date_time/${1}/ChromePublic.apk" mv "$out_dir/apks/ChromePublic.apk" "${root_dir}/apks/$date_time/${1}/ChromePublic.apk" fi elif [[ "$apk.apk" == SystemWebView.apk ]]; then if [ "$1" = "x64" ]; then mv "out/${1}/apks/SystemWebView.apk" "${root_dir}/apks/$date_time/x86_64/SystemWebView.apk" mv "$out_dir/apks/SystemWebView.apk" "${root_dir}/apks/$date_time/x86_64/SystemWebView.apk" else mv "out/${1}/apks/SystemWebView.apk" "${root_dir}/apks/$date_time/${1}/SystemWebView.apk" mv "$out_dir/apks/SystemWebView.apk" "${root_dir}/apks/$date_time/${1}/SystemWebView.apk" fi elif [[ "$apk.apk" == *6432.apk ]]; then if [ "$1" = "x64" ]; then mv "out/${1}/apks/$apk.apk" "${root_dir}/apks/$date_time/x86_64/${apk::-4}.apk" mv "$out_dir/apks/$apk.apk" "${root_dir}/apks/$date_time/x86_64/${apk::-4}.apk" elif [ "$1" = "arm64" ]; then mv "out/${1}/apks/$apk.apk" "${root_dir}/apks/$date_time/arm64/${apk::-4}.apk" mv "$out_dir/apks/$apk.apk" "${root_dir}/apks/$date_time/arm64/${apk::-4}.apk" fi else if [ "$1" = "x64" ]; then mv "out/${1}/apks/$apk.apk" "${root_dir}/apks/$date_time/x86/${apk::-2}.apk" mv "$out_dir/apks/$apk.apk" "${root_dir}/apks/$date_time/x86/${apk::-2}.apk" elif [ "$1" = "arm64" ]; then mv "out/${1}/apks/$apk.apk" "${root_dir}/apks/$date_time/arm/${apk::-2}.apk" mv "$out_dir/apks/$apk.apk" "${root_dir}/apks/$date_time/arm/${apk::-2}.apk" fi fi fi Loading