rename bromite -> cromite
This commit is contained in:
@@ -132,8 +132,10 @@ jobs:
|
||||
|
||||
if [[ "$LATEST_WIN" == "$CHR_VERSION" ]]; then
|
||||
echo Using Windows Release >>body.txt
|
||||
echo "\`\`\`" >>body.txt
|
||||
curl -s 'https://chromiumdash.appspot.com/fetch_releases?channel=Stable&platform=Windows&num=10&offset=0' | \
|
||||
jq --arg LATEST "$LATEST_WIN" '.[] | select( .version == $LATEST )' >>body.txt
|
||||
echo "\`\`\`" >>body.txt
|
||||
fi
|
||||
|
||||
if [[ "$LATEST_ANDROID" == "$CHR_VERSION" ]]; then
|
||||
|
||||
@@ -40,7 +40,7 @@ on:
|
||||
default: 'false'
|
||||
|
||||
env:
|
||||
BROMITE_SHA: ${{ github.event.inputs.sha }}
|
||||
CROMITE_SHA: ${{ github.event.inputs.sha }}
|
||||
REMOVEDOCKERSUPPORT: true
|
||||
USELOCALIMAGE: true
|
||||
|
||||
@@ -69,7 +69,7 @@ jobs:
|
||||
shell: bash
|
||||
run: |
|
||||
export VERSION=$( cat ./cromite/build/RELEASE )
|
||||
rm -rf bromite
|
||||
rm -rf cromite
|
||||
|
||||
echo Current version is $VERSION
|
||||
echo "VERSION=$VERSION" >> $GITHUB_ENV
|
||||
@@ -107,43 +107,43 @@ jobs:
|
||||
fi
|
||||
fi
|
||||
|
||||
- name: Building cromite container ${{ env.VERSION }}-${{ env.BROMITE_SHA }}
|
||||
- name: Building cromite container ${{ env.VERSION }}-${{ env.CROMITE_SHA }}
|
||||
shell: bash
|
||||
run: |
|
||||
IS_PRESENT=$(docker inspect --type=image uazo/cromite:$VERSION-$BROMITE_SHA > /dev/null ; echo $?)
|
||||
IS_PRESENT=$(docker inspect --type=image uazo/cromite:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
|
||||
if [ $IS_PRESENT -ne "0" ]; then
|
||||
IS_PRESENT=$(docker manifest inspect uazo/cromite:$VERSION-$BROMITE_SHA > /dev/null ; echo $?)
|
||||
IS_PRESENT=$(docker manifest inspect uazo/cromite:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
|
||||
if [ $IS_PRESENT -ne "0" ]; then
|
||||
DOCKER_BUILDKIT=1 docker build -t uazo/cromite:$VERSION-$BROMITE_SHA --progress plain \
|
||||
--build-arg BROMITE_SHA=$BROMITE_SHA \
|
||||
DOCKER_BUILDKIT=1 docker build -t uazo/cromite:$VERSION-$CROMITE_SHA --progress plain \
|
||||
--build-arg CROMITE_SHA=$CROMITE_SHA \
|
||||
--build-arg VERSION=$VERSION \
|
||||
--build-arg HTTP_PROXY="$PROXY_ADDR" \
|
||||
cromite/tools/images/bromite-source/.
|
||||
cromite/tools/images/cromite-source/.
|
||||
fi
|
||||
fi
|
||||
|
||||
- name: Building cromite-build container ${{ env.VERSION }}-${{ env.BROMITE_SHA }}
|
||||
- name: Building cromite-build container ${{ env.VERSION }}-${{ env.CROMITE_SHA }}
|
||||
shell: bash
|
||||
run: |
|
||||
IS_PRESENT=$(docker inspect --type=image uazo/cromite-build:$VERSION-$BROMITE_SHA > /dev/null ; echo $?)
|
||||
IS_PRESENT=$(docker inspect --type=image uazo/cromite-build:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
|
||||
if [ $IS_PRESENT -ne "0" ]; then
|
||||
IS_PRESENT=$(docker manifest inspect uazo/cromite-build:$VERSION-$BROMITE_SHA > /dev/null ; echo $?)
|
||||
IS_PRESENT=$(docker manifest inspect uazo/cromite-build:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
|
||||
if [ $IS_PRESENT -ne "0" ]; then
|
||||
DOCKER_BUILDKIT=1 docker build -t uazo/cromite-build:$VERSION-$BROMITE_SHA --progress plain \
|
||||
--build-arg BROMITE_SHA=$BROMITE_SHA \
|
||||
DOCKER_BUILDKIT=1 docker build -t uazo/cromite-build:$VERSION-$CROMITE_SHA --progress plain \
|
||||
--build-arg CROMITE_SHA=$CROMITE_SHA \
|
||||
--build-arg VERSION=$VERSION \
|
||||
--build-arg HTTP_PROXY="$PROXY_ADDR" \
|
||||
--no-cache \
|
||||
cromite/tools/images/bromite-build/.
|
||||
cromite/tools/images/cromite-build/.
|
||||
fi
|
||||
fi
|
||||
|
||||
- name: Get uazo/cromite-build from docker hub if present
|
||||
shell: bash
|
||||
run: |
|
||||
IS_PRESENT=$(docker manifest inspect uazo/cromite-build:$VERSION-$BROMITE_SHA > /dev/null ; echo $?)
|
||||
IS_PRESENT=$(docker manifest inspect uazo/cromite-build:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
|
||||
if [ $IS_PRESENT -eq "0" ]; then
|
||||
docker pull uazo/cromite-build:$VERSION-$BROMITE_SHA
|
||||
docker pull uazo/cromite-build:$VERSION-$CROMITE_SHA
|
||||
fi
|
||||
|
||||
- name: Mark image to build
|
||||
@@ -153,7 +153,7 @@ jobs:
|
||||
if [ $IS_PRESENT -eq "0" ]; then
|
||||
docker rmi uazo/cromite-build:build
|
||||
fi
|
||||
docker tag uazo/cromite-build:$VERSION-$BROMITE_SHA uazo/cromite-build:build
|
||||
docker tag uazo/cromite-build:$VERSION-$CROMITE_SHA uazo/cromite-build:build
|
||||
|
||||
build:
|
||||
runs-on: ${{ github.event.inputs.type }}
|
||||
@@ -249,7 +249,7 @@ jobs:
|
||||
cd $WORKSPACE/chromium/src
|
||||
|
||||
echo "::group::-------- gn gen"
|
||||
gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") $(cat ../../build_args.gni) target_cpu = \"x64\" " out/x64
|
||||
gn gen --args="$(cat /home/lg/working_dir/cromite/build/cromite.gn_args) target_cpu = \"x64\" " out/x64
|
||||
echo "::endgroup::"
|
||||
|
||||
echo "::group::-------- gn args"
|
||||
@@ -260,7 +260,7 @@ jobs:
|
||||
ninja -C out/x64 chrome_public_bundle
|
||||
ninja -C out/x64 chrome_public_apk
|
||||
|
||||
cp ../../bromite/build/RELEASE out/x64
|
||||
cp ../../cromite/build/RELEASE out/x64
|
||||
|
||||
- name: Get ninja logs Android x64
|
||||
if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'x64' || github.event.inputs.build == 'all') }}
|
||||
@@ -278,7 +278,7 @@ jobs:
|
||||
cd $WORKSPACE/chromium/src
|
||||
|
||||
echo "::group::-------- gn gen"
|
||||
gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") target_os = \"win\" $(cat ../../build_args.gni) target_cpu = \"x64\" " out/win64
|
||||
gn gen --args="target_os = \"win\" $(cat /home/lg/working_dir/cromite/build/cromite.gn_args) target_cpu = \"x64\" " out/win64
|
||||
echo "::endgroup::"
|
||||
|
||||
echo "::group::-------- gn args"
|
||||
@@ -288,7 +288,7 @@ jobs:
|
||||
|
||||
ninja -C out/win64 chrome
|
||||
|
||||
cp ../../bromite/build/RELEASE out/win64
|
||||
cp ../../cromite/build/RELEASE out/win64
|
||||
|
||||
- name: Get ninja logs Windows x64
|
||||
if: ${{ github.event.inputs.target_os == 'win' || github.event.inputs.target_os == 'all' }}
|
||||
@@ -306,7 +306,7 @@ jobs:
|
||||
cd $WORKSPACE/chromium/src
|
||||
|
||||
echo "::group::-------- gn gen"
|
||||
gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") $(cat ../../build_args.gni) target_cpu = \"arm64\" " out/arm64
|
||||
gn gen --args="$(cat /home/lg/working_dir/cromite/build/cromite.gn_args) target_cpu = \"arm64\" " out/arm64
|
||||
echo "::endgroup::"
|
||||
|
||||
echo "::group::-------- gn args"
|
||||
@@ -317,7 +317,7 @@ jobs:
|
||||
ninja -C out/arm64 chrome_public_bundle
|
||||
ninja -C out/arm64 chrome_public_apk
|
||||
|
||||
cp ../../bromite/build/RELEASE out/arm64
|
||||
cp ../../cromite/build/RELEASE out/arm64
|
||||
|
||||
- name: Get ninja logs Android arm64
|
||||
if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'arm64' || github.event.inputs.build == 'all') }}
|
||||
@@ -361,7 +361,7 @@ jobs:
|
||||
cd $WORKSPACE/chromium/src
|
||||
|
||||
echo "::group::-------- gn gen"
|
||||
gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") $(cat ../../build_args.gni) target_cpu = \"arm\" " out/arm
|
||||
gn gen --args="$(cat /home/lg/working_dir/cromite/build/cromite.gn_args) target_cpu = \"arm\" " out/arm
|
||||
echo "::endgroup::"
|
||||
|
||||
echo "::group::-------- gn args"
|
||||
@@ -372,7 +372,7 @@ jobs:
|
||||
ninja -C out/arm chrome_public_bundle
|
||||
ninja -C out/arm chrome_public_apk
|
||||
|
||||
cp ../../bromite/build/RELEASE out/arm
|
||||
cp ../../cromite/build/RELEASE out/arm
|
||||
|
||||
- name: Get ninja logs Android arm
|
||||
if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'arm' || github.event.inputs.build == 'all') }}
|
||||
@@ -390,7 +390,7 @@ jobs:
|
||||
cd $WORKSPACE/chromium/src
|
||||
|
||||
echo "::group::-------- gn gen"
|
||||
gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") target_os = \"linux\" $(cat ../../build_args.gni) target_cpu = \"x64\" use_sysroot = true " out/lin64
|
||||
gn gen --args="target_os = \"linux\" $(cat /home/lg/working_dir/cromite/build/cromite.gn_args) target_cpu = \"x64\" use_sysroot = true " out/lin64
|
||||
echo "::endgroup::"
|
||||
|
||||
echo "::group::-------- gn args"
|
||||
@@ -400,7 +400,7 @@ jobs:
|
||||
|
||||
ninja -C out/lin64 chrome
|
||||
|
||||
cp ../../bromite/build/RELEASE out/lin64
|
||||
cp ../../cromite/build/RELEASE out/lin64
|
||||
|
||||
- name: Get ninja logs Linux 64
|
||||
if: ${{ (github.event.inputs.target_os == 'linux' || github.event.inputs.target_os == 'all') }}
|
||||
@@ -417,10 +417,10 @@ jobs:
|
||||
PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
|
||||
cd $WORKSPACE/chromium/src
|
||||
|
||||
test -f out/arm64/bromite.idx || \
|
||||
test -f out/arm64/cromite.idx || \
|
||||
cp -r out/arm64 out/clangd && \
|
||||
gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") $(cat ../../build_args.gni) skip_clangd_unsupported_options = true" out/clangd && \
|
||||
gn gen --args="import(\"/home/lg/working_dir/cromite/build/cromite.gn_args\") $(cat ../../build_args.gni) skip_clangd_unsupported_options = true" out/clangd && \
|
||||
$WORKSPACE/ninja/ninja -C $WORKSPACE/chromium/src/out/clangd -a chrome_public_apk \
|
||||
-t compdb cc cxx objc objcxx >$WORKSPACE/chromium/src/out/clangd/compile_commands.json && \
|
||||
/home/lg/working_dir/clangd_snapshot_20211205/bin/clangd-indexer --executor=all-TUs out/clangd/compile_commands.json >out/arm64/bromite.idx && \
|
||||
/home/lg/working_dir/clangd_snapshot_20211205/bin/clangd-indexer --executor=all-TUs out/clangd/compile_commands.json >out/arm64/cromite.idx && \
|
||||
rm -rf out/clangd
|
||||
|
||||
@@ -108,7 +108,7 @@ jobs:
|
||||
bash ~/cromite/tools/apply-all-patch.sh || exit 1
|
||||
|
||||
rm -rf ~/cromite/build/patches-new/
|
||||
rm ~/cromite/build/bromite_patches_list_new.txt
|
||||
rm ~/cromite/build/cromite_patches_list_new.txt
|
||||
|
||||
- name: Export patches
|
||||
run: |
|
||||
|
||||
@@ -15,7 +15,7 @@ on:
|
||||
default: 'ci'
|
||||
|
||||
env:
|
||||
BROMITE_SHA: ${{ github.event.inputs.sha }}
|
||||
CROMITE_SHA: ${{ github.event.inputs.sha }}
|
||||
REMOVEDOCKERSUPPORT: true
|
||||
USELOCALIMAGE: true
|
||||
|
||||
@@ -39,7 +39,7 @@ jobs:
|
||||
run: |
|
||||
wget https://github.com/ericchiang/pup/releases/download/v0.4.0/pup_v0.4.0_linux_amd64.zip
|
||||
unzip pup_v0.4.0_linux_amd64.zip && rm pup_v0.4.0_linux_amd64.zip
|
||||
BRANCH=$(curl https://github.com/uazo/cromite/branch_commits/$BROMITE_SHA | ./pup -p li.branch:last-child a text{} | xargs)
|
||||
BRANCH=$(curl https://github.com/uazo/cromite/branch_commits/$CROMITE_SHA | ./pup -p li.branch:last-child a text{} | xargs)
|
||||
echo "BRANCH=$BRANCH" >> $GITHUB_ENV
|
||||
|
||||
wget https://github.com/cli/cli/releases/download/v2.18.1/gh_2.18.1_linux_amd64.tar.gz
|
||||
@@ -70,14 +70,14 @@ jobs:
|
||||
# echo "you can try it at your own risk." >>note
|
||||
echo "\`\`\`" >>note
|
||||
|
||||
$GH release create $VERSION-$BROMITE_SHA --notes-file note -d
|
||||
$GH release create $VERSION-$CROMITE_SHA --notes-file note -d
|
||||
|
||||
# android arm
|
||||
echo "::group::-------- android arm"
|
||||
sudo cp ${{ env.OUTPUTFILE_ARM }}/apks/ChromePublic.apk arm_ChromePublic.apk
|
||||
sudo chown runner arm_ChromePublic.apk
|
||||
echo Uploading arm_ChromePublic
|
||||
$GH release upload $VERSION-$BROMITE_SHA arm_ChromePublic.apk
|
||||
$GH release upload $VERSION-$CROMITE_SHA arm_ChromePublic.apk
|
||||
echo "::endgroup::"
|
||||
|
||||
# android arm64
|
||||
@@ -85,7 +85,7 @@ jobs:
|
||||
sudo cp ${{ env.OUTPUTFILE_ARM64 }}/apks/ChromePublic.apk arm64_ChromePublic.apk
|
||||
sudo chown runner arm64_ChromePublic.apk
|
||||
echo Uploading arm64_ChromePublic
|
||||
$GH release upload $VERSION-$BROMITE_SHA arm64_ChromePublic.apk
|
||||
$GH release upload $VERSION-$CROMITE_SHA arm64_ChromePublic.apk
|
||||
echo "::endgroup::"
|
||||
|
||||
# android x64
|
||||
@@ -93,25 +93,25 @@ jobs:
|
||||
sudo cp ${{ env.OUTPUTFILE_X64 }}/apks/ChromePublic.apk x64_ChromePublic.apk
|
||||
sudo chown runner x64_ChromePublic.apk
|
||||
echo Uploading x64_ChromePublic
|
||||
$GH release upload $VERSION-$BROMITE_SHA x64_ChromePublic.apk
|
||||
$GH release upload $VERSION-$CROMITE_SHA x64_ChromePublic.apk
|
||||
echo "::endgroup::"
|
||||
|
||||
echo "::group::-------- chrome.size"
|
||||
test $VERSION-$BROMITE_SHA $OUTPUTFILE_ARM64/chrome.size && \
|
||||
$GH release upload $VERSION-$BROMITE_SHA $OUTPUTFILE_ARM64/chrome.size
|
||||
test $VERSION-$CROMITE_SHA $OUTPUTFILE_ARM64/chrome.size && \
|
||||
$GH release upload $VERSION-$CROMITE_SHA $OUTPUTFILE_ARM64/chrome.size
|
||||
echo "::endgroup::"
|
||||
|
||||
echo "::group::-------- ChromePublic.apk.mapping"
|
||||
sudo cp ${{ env.OUTPUTFILE_ARM64 }}/apks/ChromePublic.apk.mapping arm64_ChromePublic.apk.mapping
|
||||
$GH release upload $VERSION-$BROMITE_SHA arm64_ChromePublic.apk.mapping
|
||||
$GH release upload $VERSION-$CROMITE_SHA arm64_ChromePublic.apk.mapping
|
||||
sudo cp ${{ env.OUTPUTFILE_X64 }}/apks/ChromePublic.apk.mapping x64_ChromePublic.apk.mapping
|
||||
$GH release upload $VERSION-$BROMITE_SHA x64_ChromePublic.apk.mapping
|
||||
$GH release upload $VERSION-$CROMITE_SHA x64_ChromePublic.apk.mapping
|
||||
echo "::endgroup::"
|
||||
|
||||
echo "::group::-------- Uploading arm64_ninja_log_trace.html"
|
||||
test $OUTPUTFILE_ARM64/ninja_log_trace.html && \
|
||||
cp $OUTPUTFILE_ARM64/ninja_log_trace.html arm64_ninja_log_trace.html && \
|
||||
$GH release upload $VERSION-$BROMITE_SHA arm64_ninja_log_trace.html
|
||||
$GH release upload $VERSION-$CROMITE_SHA arm64_ninja_log_trace.html
|
||||
echo "::endgroup::"
|
||||
|
||||
# windows x64
|
||||
@@ -149,27 +149,27 @@ jobs:
|
||||
zip -r chrome-win.zip chrome-win/
|
||||
|
||||
echo Uploading chrome-win.zip
|
||||
$GH release upload $VERSION-$BROMITE_SHA chrome-win.zip
|
||||
$GH release upload $VERSION-$CROMITE_SHA chrome-win.zip
|
||||
echo "::endgroup::"
|
||||
|
||||
echo "::group::-------- arm64 symbols"
|
||||
zip arm64_symbols.zip ${{ env.OUTPUTFILE_ARM64 }}/dump_syms \
|
||||
${{ env.OUTPUTFILE_ARM64 }}/minidump_stackwalk \
|
||||
${{ env.OUTPUTFILE_ARM64 }}/libchrome.so
|
||||
$GH release upload $VERSION-$BROMITE_SHA arm64_symbols.zip
|
||||
$GH release upload $VERSION-$CROMITE_SHA arm64_symbols.zip
|
||||
echo "::endgroup::"
|
||||
|
||||
# workaround for https://github.com/cli/cli/issues/6599
|
||||
sleep 30s
|
||||
|
||||
TIMESTAMP=$(date +%s -r chrome-win.zip)
|
||||
echo >updateurl.txt "browser=chromium;os=windows;architecture=64-bit;timestamp=$TIMESTAMP;editor=uazo;channel=stable;repository=https://github.com/uazo/cromite/releases;download=https://github.com/uazo/cromite/releases/latest/download/chrome-win.zip;version=$(cat $OUTPUTFILE_WIN/RELEASE);revision=1;commit=$BROMITE_SHA"
|
||||
$GH release upload $VERSION-$BROMITE_SHA updateurl.txt
|
||||
echo >updateurl.txt "browser=chromium;os=windows;architecture=64-bit;timestamp=$TIMESTAMP;editor=uazo;channel=stable;repository=https://github.com/uazo/cromite/releases;download=https://github.com/uazo/cromite/releases/latest/download/chrome-win.zip;version=$(cat $OUTPUTFILE_WIN/RELEASE);revision=1;commit=$CROMITE_SHA"
|
||||
$GH release upload $VERSION-$CROMITE_SHA updateurl.txt
|
||||
|
||||
$GH release edit $VERSION-$BROMITE_SHA -t $VERSION-$BROMITE_SHA
|
||||
$GH release edit $VERSION-$BROMITE_SHA --draft=false
|
||||
$GH release edit $VERSION-$CROMITE_SHA -t $VERSION-$CROMITE_SHA
|
||||
$GH release edit $VERSION-$CROMITE_SHA --draft=false
|
||||
|
||||
VERSION=$(cat ${{ env.OUTPUTFILE_ARM64 }}/RELEASE)
|
||||
docker push uazo/cromite:$VERSION-$BROMITE_SHA
|
||||
docker push uazo/cromite-build:$VERSION-$BROMITE_SHA
|
||||
docker push uazo/cromite:$VERSION-$CROMITE_SHA
|
||||
docker push uazo/cromite-build:$VERSION-$CROMITE_SHA
|
||||
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
e3a3a1fe718bf559be801d14660fb6f9dc9bf603-
|
||||
@@ -1 +0,0 @@
|
||||
5923fa90d4e3587c130983442b9cf90f4c76e851
|
||||
@@ -1,48 +0,0 @@
|
||||
android_channel="stable"
|
||||
blink_symbol_level=1
|
||||
build_contextual_search=false
|
||||
build_with_tflite_lib=false
|
||||
chrome_pgo_phase=0
|
||||
dcheck_always_on=false
|
||||
debuggable_apks=false
|
||||
dfmify_dev_ui=false
|
||||
disable_android_lint=true
|
||||
disable_autofill_assistant_dfm=true
|
||||
disable_fieldtrial_testing_config=true
|
||||
disable_tab_ui_dfm=true
|
||||
enable_av1_decoder=true
|
||||
enable_dav1d_decoder=true
|
||||
enable_gvr_services=false
|
||||
enable_hangout_services_extension=false
|
||||
enable_iterator_debugging=false
|
||||
enable_mdns=false
|
||||
enable_mse_mpeg2ts_stream_parser=true
|
||||
enable_nacl=false
|
||||
enable_platform_dolby_vision=true
|
||||
enable_platform_hevc=true
|
||||
enable_remoting=false
|
||||
enable_reporting=true
|
||||
enable_supervised_users=false
|
||||
enable_vr=false
|
||||
exclude_unwind_tables=false
|
||||
ffmpeg_branding="Chrome"
|
||||
icu_use_data_file=true
|
||||
is_cfi=true
|
||||
is_component_build=false
|
||||
is_debug=false
|
||||
is_official_build=true
|
||||
proprietary_codecs=true
|
||||
rtc_build_examples=false
|
||||
safe_browsing_mode=2
|
||||
symbol_level=1
|
||||
system_webview_package_name="com.android.webview"
|
||||
target_os="android"
|
||||
treat_warnings_as_errors=true
|
||||
use_cfi_cast=true
|
||||
use_debug_fission=true
|
||||
use_errorprone_java_compiler=false
|
||||
use_gnome_keyring=false
|
||||
use_official_google_api_keys=false
|
||||
use_rtti=false
|
||||
use_sysroot=false
|
||||
webview_includes_weblayer=false
|
||||
@@ -1,11 +0,0 @@
|
||||
AV1-codec-support.patch
|
||||
exit-on-failure-of-inclusion.patch
|
||||
Reintroduce-override_build_timestamp.patch
|
||||
do-not-hide-.orig-files.patch
|
||||
Do-not-link-with-libatomic.patch
|
||||
do-not-add-suffix-to-package-name.patch
|
||||
Switch-to-fstack-protector-strong.patch
|
||||
Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
|
||||
enable-ftrivial-auto-var-init-zero.patch
|
||||
Disable-feeds-support-by-default.patch
|
||||
Chromium-package-name.patch
|
||||
@@ -32,7 +32,7 @@ is_official_build=true
|
||||
proprietary_codecs=true
|
||||
rtc_build_examples=false
|
||||
symbol_level=1
|
||||
system_webview_package_name="org.bromite.webview"
|
||||
system_webview_package_name="org.cromite.webview"
|
||||
target_os="android"
|
||||
treat_warnings_as_errors=true
|
||||
use_debug_fission=true
|
||||
@@ -55,4 +55,58 @@ use_relr_relocations=false
|
||||
|
||||
# disabled the use of the context snapshot
|
||||
# see https://github.com/uazo/cromite/pull/317 for context
|
||||
use_v8_context_snapshot = false
|
||||
use_v8_context_snapshot = false
|
||||
|
||||
declare_args() {
|
||||
_is_debug_build = ""
|
||||
}
|
||||
|
||||
not_needed(["_target_build", "_is_debug_build"])
|
||||
|
||||
if (getenv("TARGET_CPU") != "") {
|
||||
target_cpu = getenv("TARGET_CPU")
|
||||
}
|
||||
|
||||
if (target_os == "android") {
|
||||
target_os = "android" # fix traffic annotation auditor
|
||||
#enable_kythe_annotations = true
|
||||
chrome_public_manifest_package = "org.cromite.cromite"
|
||||
|
||||
if (getenv("USE_KEYSTORE") != "") {
|
||||
android_keystore_path = "/home/lg/working_dir/cromite.keystore"
|
||||
android_keystore_name = "cromite"
|
||||
android_keystore_password = getenv("KEYSTORE_PASSWORD")
|
||||
}
|
||||
|
||||
cromite_pref_hash_seed_bin = getenv("CROMITE_PREF_HASH_SEED_BIN")
|
||||
|
||||
_is_debug_build = getenv("TARGET_ISDEBUG")
|
||||
if(_is_debug_build == "true") {
|
||||
# print("Debug build on")
|
||||
is_debug = true
|
||||
is_official_build = false
|
||||
dcheck_always_on = true
|
||||
symbol_level = 1
|
||||
strip_debug_info = false
|
||||
generate_linker_map = false
|
||||
} else {
|
||||
generate_linker_map = true
|
||||
}
|
||||
}
|
||||
|
||||
if (target_os == "win") {
|
||||
target_os = "win" # fix traffic annotation auditor
|
||||
target_cpu = "x64"
|
||||
symbol_level = 0
|
||||
use_large_pdbs = true
|
||||
|
||||
enable_pdf = true
|
||||
pdf_is_complete_lib = true
|
||||
enable_plugins = true
|
||||
enable_ppapi = false
|
||||
|
||||
chrome_pgo_phase = 2 # enable pgo
|
||||
|
||||
is_cfi = false # disable it
|
||||
use_cfi_cast = false # disable it
|
||||
}
|
||||
@@ -1,47 +0,0 @@
|
||||
android_channel="stable"
|
||||
blink_symbol_level=1
|
||||
build_contextual_search=false
|
||||
build_with_tflite_lib=false
|
||||
chrome_pgo_phase=0
|
||||
dcheck_always_on=false
|
||||
dfmify_dev_ui=false
|
||||
disable_android_lint=true
|
||||
disable_autofill_assistant_dfm=true
|
||||
disable_fieldtrial_testing_config=true
|
||||
disable_tab_ui_dfm=true
|
||||
enable_av1_decoder=true
|
||||
enable_dav1d_decoder=true
|
||||
enable_gvr_services=false
|
||||
enable_hangout_services_extension=false
|
||||
enable_iterator_debugging=false
|
||||
enable_mdns=false
|
||||
enable_mse_mpeg2ts_stream_parser=true
|
||||
enable_nacl=false
|
||||
enable_platform_dolby_vision=true
|
||||
enable_platform_hevc=true
|
||||
enable_remoting=false
|
||||
enable_reporting=false
|
||||
enable_supervised_users=false
|
||||
enable_vr=false
|
||||
exclude_unwind_tables=false
|
||||
ffmpeg_branding="Chrome"
|
||||
icu_use_data_file=true
|
||||
is_cfi=true
|
||||
is_component_build=false
|
||||
is_debug=false
|
||||
is_official_build=true
|
||||
proprietary_codecs=true
|
||||
rtc_build_examples=false
|
||||
safe_browsing_mode=0
|
||||
symbol_level=1
|
||||
system_webview_package_name="com.android.webview"
|
||||
target_os="linux"
|
||||
treat_warnings_as_errors=true
|
||||
use_cfi_cast=true
|
||||
use_debug_fission=true
|
||||
use_errorprone_java_compiler=false
|
||||
use_gnome_keyring=false
|
||||
use_official_google_api_keys=false
|
||||
use_rtti=false
|
||||
use_sysroot=false
|
||||
webview_includes_weblayer=false
|
||||
-18
@@ -1,18 +0,0 @@
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Version: GnuPG v2
|
||||
|
||||
mQENBFphnJwBCAC1qSMaPR5Nq9sEHa9ZePwoGLFafjOBcApz7IYW7dIsQYXVUHlo
|
||||
lbBwwfFUjnnIf/wzZ42ck/QGRKJ18qA9VybWyT8as0Sz26Tmxah31vI7kzlBZCYY
|
||||
/ZER5N3onQFVVVoynYxmep5HdK7enAXOtLBOogbJ/x2Q9ITPuJ+Pv3b4R5E2ui/i
|
||||
hFAruUh+oifPBzh3fjBTTr0uvDqbsnsczQptFghKxYyJiPTblCD51Ou11a3uNt1y
|
||||
PuG1bR5jImgt33T6zjdFac6kQ2Zalxa/URU/FQPiYJ1X2J1jCgdEgRKlK70ha+oN
|
||||
mnVWhFzjecuCw180HCZh1OQho+LPWbtMFyvtABEBAAG0M2NzYWdhbjUgPDMyNjg1
|
||||
Njk2K2NzYWdhbjVAdXNlcnMubm9yZXBseS5naXRodWIuY29tPokBIgQTAQgAFgUC
|
||||
WmGcnAkQZBkKUdhdwMUCGwsCGQEAADpDB/4zlnDg1gToKqtz994jLzUM7PJOPTWa
|
||||
c8xGCj7l8BpGcCOK0fk7fOQ+bDYT0OSHZ1OCR7Gbm6ENu03wNLQ7W9Tr0uf/yDIP
|
||||
mItcFk6nYmMKPnK6bd7QWLMsT9mK6mYb02zt6Ql8D7EsWGxifQVQG85ETObhoSqw
|
||||
EH6zqZvflxJLmN+vh/Orm1ipzEvw7cjvpSloDwypjY6x9MGEE9utFcGySx726gKu
|
||||
Wmz417QZc/TpylCd1p72G9pCqv1Si+y+P9tSEdjWSM6EqEwMr5W+IJ1O6BZQ7A9p
|
||||
0l2FZqYC2WkRDJZqWiYoYltP6z1SEbbVI5rQaaVAesS1Ae8OOR9EmlK8
|
||||
=6Hsd
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
@@ -5,8 +5,8 @@ git am --abort
|
||||
PATCH_OLD_PATH=~/cromite/build/patches
|
||||
PATCH_NEW_PATH=~/cromite/build/patches-new
|
||||
|
||||
DESTINATION=~/cromite/build/bromite_patches_list_ok.txt
|
||||
DESTINATION_FAILED=~/cromite/build/bromite_patches_list_failed.txt
|
||||
DESTINATION=~/cromite/build/cromite_patches_list_ok.txt
|
||||
DESTINATION_FAILED=~/cromite/build/cromite_patches_list_failed.txt
|
||||
|
||||
rm $DESTINATION
|
||||
rm $DESTINATION_FAILED
|
||||
@@ -14,9 +14,9 @@ mkdir $PATCH_NEW_PATH
|
||||
|
||||
IFS=$'\n'
|
||||
|
||||
PATCH_LIST=~/cromite/build/bromite_patches_list_new.txt
|
||||
PATCH_LIST=~/cromite/build/cromite_patches_list_new.txt
|
||||
if [ ! -f $PATCH_LIST ]; then
|
||||
cp ~/cromite/build/bromite_patches_list.txt $PATCH_LIST
|
||||
cp ~/cromite/build/cromite_patches_list.txt $PATCH_LIST
|
||||
fi
|
||||
|
||||
echo "Phase 1: check clean"
|
||||
|
||||
@@ -29,7 +29,7 @@ for patch in $ALLPATCHS_E; do
|
||||
|
||||
done
|
||||
|
||||
PATCH_LIST=~/cromite/build/bromite_patches_list.txt
|
||||
PATCH_LIST=~/cromite/build/cromite_patches_list.txt
|
||||
mkdir ~/cromite/build/patches-new/changed
|
||||
mkdir ~/cromite/build/patches-new/contrib
|
||||
for current_file in $(cat $PATCH_LIST); do
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
name: 'Prepare Bromite Builder Image'
|
||||
description: 'Check and build Bromite builder image by sha'
|
||||
|
||||
inputs:
|
||||
sha:
|
||||
description: 'Bromite sha ref'
|
||||
required: true
|
||||
|
||||
runs:
|
||||
using: "composite"
|
||||
steps:
|
||||
- name: Checking image for "${{ inputs.sha }}"
|
||||
shell: bash
|
||||
run: |
|
||||
BROMITE_SHA="${{ inputs.sha }}"
|
||||
|
||||
IS_PRESENT=$(docker inspect --type=image uazo/bromite-build:$BROMITE_SHA > /dev/null ; echo $?)
|
||||
if [ $IS_PRESENT -ne "0" ]; then
|
||||
IS_PRESENT=$(docker manifest inspect uazo/bromite-build:$BROMITE_SHA > /dev/null ; echo $?)
|
||||
if [ $IS_PRESENT -ne "0" ]; then
|
||||
echo "Image not found"
|
||||
|
||||
mkdir bromite-source
|
||||
pushd bromite-source/
|
||||
git clone https://github.com/uazo/bromite-buildtools
|
||||
|
||||
cd bromite-buildtools/images/bromite-build/
|
||||
DOCKER_BUILDKIT=1 docker build -t uazo/bromite-build:$BROMITE_SHA --progress plain \
|
||||
--build-arg BROMITE_SHA=$BROMITE_SHA \
|
||||
.
|
||||
|
||||
popd
|
||||
fi
|
||||
fi
|
||||
@@ -1,54 +0,0 @@
|
||||
|
||||
declare_args() {
|
||||
_is_debug_build = ""
|
||||
}
|
||||
|
||||
not_needed(["_target_build", "_is_debug_build"])
|
||||
|
||||
if (getenv("TARGET_CPU") != "") {
|
||||
target_cpu = getenv("TARGET_CPU")
|
||||
}
|
||||
|
||||
if (target_os == "android") {
|
||||
target_os = "android" # fix traffic annotation auditor
|
||||
#enable_kythe_annotations = true
|
||||
chrome_public_manifest_package = "org.cromite.cromite"
|
||||
|
||||
if (getenv("USE_KEYSTORE") != "") {
|
||||
android_keystore_path = "/home/lg/working_dir/cromite.keystore"
|
||||
android_keystore_name = "cromite"
|
||||
android_keystore_password = getenv("KEYSTORE_PASSWORD")
|
||||
}
|
||||
|
||||
cromite_pref_hash_seed_bin = getenv("CROMITE_PREF_HASH_SEED_BIN")
|
||||
|
||||
_is_debug_build = getenv("TARGET_ISDEBUG")
|
||||
if(_is_debug_build == "true") {
|
||||
# print("Debug build on")
|
||||
is_debug = true
|
||||
is_official_build = false
|
||||
dcheck_always_on = true
|
||||
symbol_level = 1
|
||||
strip_debug_info = false
|
||||
generate_linker_map = false
|
||||
} else {
|
||||
generate_linker_map = true
|
||||
}
|
||||
}
|
||||
|
||||
if (target_os == "win") {
|
||||
target_os = "win" # fix traffic annotation auditor
|
||||
target_cpu = "x64"
|
||||
symbol_level = 0
|
||||
use_large_pdbs = true
|
||||
|
||||
enable_pdf = true
|
||||
pdf_is_complete_lib = true
|
||||
enable_plugins = true
|
||||
enable_ppapi = false
|
||||
|
||||
chrome_pgo_phase = 2 # enable pgo
|
||||
|
||||
is_cfi = false # disable it
|
||||
use_cfi_cast = false # disable it
|
||||
}
|
||||
@@ -1,82 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
RED='\033[0;31m'
|
||||
NC='\033[0m' # No Color
|
||||
|
||||
WORKSPACE=/home/lg/working_dir
|
||||
|
||||
PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
|
||||
|
||||
export GOMA_SERVER_HOST=$SERVER_HOST_GOMA
|
||||
export GOMA_SERVER_PORT=5050
|
||||
export GOMA_USE_SSL=false
|
||||
export GOMA_HTTP_AUTHORIZATION_FILE=$WORKSPACE/.debug_auth_file
|
||||
export GOMA_HERMETIC=error
|
||||
export GOMA_USE_LOCAL=false
|
||||
export GOMA_FALLBACK=true
|
||||
export GOMA_ARBITRARY_TOOLCHAIN_SUPPORT=true
|
||||
|
||||
$WORKSPACE/goma/goma_ctl.py ensure_stop
|
||||
$WORKSPACE/goma/goma_ctl.py ensure_start
|
||||
|
||||
cd chromium/src
|
||||
|
||||
OUT_PRESENT=0
|
||||
test -d out/bromite && OUT_PRESENT=1
|
||||
if [[ OUT_PRESENT -eq 0 ]]; then
|
||||
|
||||
echo -e ${RED} -------- sync out folder ${NC}
|
||||
test -d ../../artifacs/out/bromite && \
|
||||
mkdir -p out/bromite && \
|
||||
cp -arp ../../artifacs/out/bromite/* out/bromite/
|
||||
|
||||
echo -e ${RED} -------- gn gen ${NC}
|
||||
gn gen --args="import(\"/home/lg/working_dir/bromite/build/GN_ARGS\") use_goma=true goma_dir=\"$WORKSPACE/goma\" $(cat ../../build_args.gni) " out/bromite
|
||||
|
||||
echo -e ${RED} -------- gn args ${NC}
|
||||
gn args out/bromite/ --list --short
|
||||
gn args out/bromite/ --list >$WORKSPACE/artifacs/gn_list
|
||||
|
||||
echo -e ${RED} -------- apply .mtool ${NC}
|
||||
test -f out/bromite/.mtool && \
|
||||
cp out/bromite/.mtool .mtool && \
|
||||
$WORKSPACE/mtool/chromium/mtime.sh --restore
|
||||
|
||||
fi
|
||||
|
||||
if [[ -z "${GOMAJOBS}" ]]; then
|
||||
GOMAJOBS=40
|
||||
fi
|
||||
|
||||
echo -e ${RED} -------- pre-cache toolchain ${NC}
|
||||
sudo ../../casupload --cas-server=unix:/tmp/proxy/bots.sock --instance=default_instance \
|
||||
third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include \
|
||||
third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/include \
|
||||
third_party/llvm-build/Release+Asserts/lib \
|
||||
third_party/llvm-build/Release+Asserts/bin \
|
||||
buildtools/third_party/libc++ \
|
||||
chrome/android/profiles/afdo.prof
|
||||
|
||||
|
||||
echo -e ${RED} -------- start build ${NC}
|
||||
autoninja -j $GOMAJOBS -C out/bromite chrome_public_apk
|
||||
echo -e ${RED} -------- end build ${NC}
|
||||
|
||||
wget http://127.0.0.1:8088/logz?INFO -O ../../artifacs/goma-client.log
|
||||
cp out/bromite/apks/* $WORKSPACE/artifacs/
|
||||
|
||||
echo -e ${RED} -------- generating breakpad symbols ${NC}
|
||||
autoninja -j $GOMAJOBS -C out/bromite minidump_stackwalk dump_syms
|
||||
components/crash/content/tools/generate_breakpad_symbols.py --build-dir=out/bromite \
|
||||
--symbols-dir=$WORKSPACE/artifacs/symbols/ --binary=out/bromite/lib.unstripped/libchrome.so --clear --verbose
|
||||
cp out/bromite/lib.unstripped/libchrome.so $WORKSPACE/artifacs/symbols/libchrome.lib.so
|
||||
cp out/bromite/minidump_stackwalk $WORKSPACE/artifacs/symbols
|
||||
cp out/bromite/dump_syms $WORKSPACE/artifacs/symbols
|
||||
|
||||
echo -e ${RED} -------- sync out folder ${NC}
|
||||
$WORKSPACE/mtool/chromium/mtime.sh --backup
|
||||
mv .mtool out/bromite/
|
||||
cp -arp out/bromite $WORKSPACE/artifacs/out
|
||||
|
||||
echo -e ${RED} -------- stop goma ${NC}
|
||||
$WORKSPACE/goma/goma_ctl.py ensure_stop
|
||||
@@ -1,41 +0,0 @@
|
||||
name: 'Prepare Bromite Source Image'
|
||||
description: 'Check and build Bromite sources image by version'
|
||||
|
||||
inputs:
|
||||
version:
|
||||
description: 'Chromium Version (example 91.0.4472.146)'
|
||||
required: true
|
||||
|
||||
sha:
|
||||
description: 'Bromite sha ref'
|
||||
required: true
|
||||
|
||||
runs:
|
||||
using: "composite"
|
||||
steps:
|
||||
- name: Checking image for "${{ inputs.sha }}"
|
||||
shell: bash
|
||||
run: |
|
||||
BROMITE_SHA="${{ inputs.sha }}"
|
||||
VERSION="${{ inputs.version }}"
|
||||
|
||||
IS_PRESENT=$(docker inspect --type=image uazo/bromite:$BROMITE_SHA > /dev/null ; echo $?)
|
||||
if [ $IS_PRESENT -ne "0" ]; then
|
||||
IS_PRESENT=$(docker manifest inspect uazo/bromite:$BROMITE_SHA > /dev/null ; echo $?)
|
||||
if [ $IS_PRESENT -ne "0" ]; then
|
||||
echo "Image not found"
|
||||
|
||||
mkdir bromite-source
|
||||
pushd bromite-source/
|
||||
|
||||
git clone https://github.com/uazo/bromite-buildtools
|
||||
|
||||
cd bromite-buildtools/images/bromite-source/
|
||||
DOCKER_BUILDKIT=1 docker build -t uazo/bromite:$BROMITE_SHA --progress plain \
|
||||
--build-arg BROMITE_SHA=$BROMITE_SHA \
|
||||
--build-arg VERSION=$VERSION \
|
||||
.
|
||||
|
||||
popd
|
||||
fi
|
||||
fi
|
||||
@@ -1,7 +1,7 @@
|
||||
ARG BROMITE_SHA
|
||||
ARG CROMITE_SHA
|
||||
ARG VERSION
|
||||
|
||||
FROM uazo/cromite:$VERSION-$BROMITE_SHA
|
||||
FROM uazo/cromite:$VERSION-$CROMITE_SHA
|
||||
|
||||
ARG HTTP_PROXY
|
||||
ENV HTTP_PROXY=$HTTP_PROXY
|
||||
@@ -8,7 +8,7 @@ PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPA
|
||||
|
||||
sudo apt-get install -y lsof libgoogle-glog-dev libprotobuf17 libgrpc++1 parallel golang-go nano
|
||||
|
||||
echo -e ${RED} -------- download mtool ${NC}
|
||||
echo -e ${RED} -------- download bromite mtool ${NC}
|
||||
git clone https://github.com/bromite/mtool
|
||||
cd mtool
|
||||
make
|
||||
@@ -58,7 +58,7 @@ echo -e ${RED} -------- build modified ninja ${NC}
|
||||
cd $WORKSPACE/
|
||||
git clone https://github.com/ninja-build/ninja.git -b v1.8.2
|
||||
cd ninja
|
||||
git apply $WORKSPACE/bromite/tools/ninja-one-target-for-compdb.patch
|
||||
git apply $WORKSPACE/cromite/tools/ninja-one-target-for-compdb.patch
|
||||
CXX=clang++ ./configure.py --bootstrap
|
||||
|
||||
echo -e ${RED} -------- download clang indexer ${NC}
|
||||
@@ -2,8 +2,8 @@ ARG VERSION
|
||||
|
||||
FROM uazo/chromium:$VERSION
|
||||
|
||||
ARG BROMITE_SHA
|
||||
ENV BROMITE_SHA=$BROMITE_SHA
|
||||
ARG CROMITE_SHA
|
||||
ENV CROMITE_SHA=$CROMITE_SHA
|
||||
|
||||
ARG HTTP_PROXY
|
||||
ENV HTTP_PROXY=$HTTP_PROXY
|
||||
@@ -17,16 +17,16 @@ RUN sudo chown lg /etc/apt/apt.conf.d/proxy.conf
|
||||
RUN sudo echo "Acquire::http::Proxy \"$HTTP_PROXY\";" >/etc/apt/apt.conf.d/proxy.conf
|
||||
RUN sudo apt-get update
|
||||
|
||||
COPY apply-bromite-patches.sh .
|
||||
COPY apply-cromite-patches.sh .
|
||||
|
||||
RUN sudo chmod +x ./apply-bromite-patches.sh && \
|
||||
mkdir bromite && \
|
||||
cd bromite && \
|
||||
RUN sudo chmod +x ./apply-cromite-patches.sh && \
|
||||
mkdir cromite && \
|
||||
cd cromite && \
|
||||
git init && \
|
||||
git remote add origin https://github.com/uazo/cromite && \
|
||||
git fetch origin $BROMITE_SHA && \
|
||||
git fetch origin $CROMITE_SHA && \
|
||||
git reset --hard FETCH_HEAD && \
|
||||
cd ..
|
||||
|
||||
RUN ./apply-bromite-patches.sh
|
||||
RUN ./apply-cromite-patches.sh
|
||||
|
||||
+4
-4
@@ -17,11 +17,11 @@ git add -f v8 >/dev/null
|
||||
git commit -m ":NOEXPORT: v8 repo" >/dev/null
|
||||
|
||||
echo -e ${RED} ------- patches ${NC}
|
||||
cat ../../bromite/build/bromite_patches_list.txt
|
||||
cat ../../cromite/build/cromite_patches_list.txt
|
||||
echo
|
||||
|
||||
echo -e ${RED} ------- apply patches ${NC}
|
||||
for file in $(cat ../../bromite/build/bromite_patches_list.txt) ; do
|
||||
for file in $(cat ../../cromite/build/cromite_patches_list.txt) ; do
|
||||
|
||||
if [[ "$file" == *".patch" ]]; then
|
||||
#if [[ "$file" == *"Automated-domain-substitution"* ]]; then
|
||||
@@ -32,11 +32,11 @@ for file in $(cat ../../bromite/build/bromite_patches_list.txt) ; do
|
||||
echo -e ${RED} " -> Apply $file" ${NC}
|
||||
|
||||
REPL="0,/^---/s//FILE:"$(basename $file)"\n---/"
|
||||
cat ../../bromite/build/patches/$file | sed $REPL | git am
|
||||
cat ../../cromite/build/patches/$file | sed $REPL | git am
|
||||
|
||||
if [ $? -ne 0 ]
|
||||
then
|
||||
echo -e "Error on ../../bromite/build/patches/${file}"
|
||||
echo -e "Error on ../../cromite/build/patches/${file}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user