From 2291cbe5d0cb1b81167231c04997590065fb5072 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sat, 27 Jan 2018 23:26:41 +0100 Subject: [PATCH] Use relative paths Use verbose shell commands Update sorting of deps Fix license auto-accept Many other fixes for proper building --- fdroid/GN_ARGS | 27 + fdroid/build.sh | 44 +- fdroid/common | 9 + fdroid/depot-tools.env | 3 - fdroid/gclient-prepare.sh | 1458 +++++++++++++++----------------- fdroid/gclient_android.default | 4 +- fdroid/gclient_entries | 35 +- fdroid/install-deps.sh | 17 +- fdroid/sync.sh | 43 +- 9 files changed, 809 insertions(+), 831 deletions(-) create mode 100644 fdroid/GN_ARGS create mode 100644 fdroid/common delete mode 100644 fdroid/depot-tools.env diff --git a/fdroid/GN_ARGS b/fdroid/GN_ARGS new file mode 100644 index 00000000..f0af998d --- /dev/null +++ b/fdroid/GN_ARGS @@ -0,0 +1,27 @@ + +## is_official_build enables some optimizations +target_os="android" symbol_level=1 remove_webcore_debug_symbols=true is_debug=false is_official_build=true use_errorprone_java_compiler=false + +## codec settings +enable_ac3_eac3_audio_demuxing=true enable_hevc_demuxing=true enable_iterator_debugging=false +enable_mse_mpeg2ts_stream_parser=true ffmpeg_branding="Chrome" proprietary_codecs=true enable_widevine=true +use_openh264=true chrome_pgo_phase=0 full_wpo_on_official=true + +## disable some features that don't work anymore/undesired +enable_google_now=false +enable_webrtc=false +use_official_google_api_keys=false +enable_nacl=false + +android_channel="stable" + +enable_resource_whitelist_generation=false +use_sysroot=false + +## reduce from the default of 50 since the build box has limited resources +jumbo_file_merge_limit=30 + +## signing is deletegated to F-Droid +#android_keystore_path="//build/android/bromite.keystore" +#android_keystore_name = "bromitekey" +#android_keystore_password = "bromite" diff --git a/fdroid/build.sh b/fdroid/build.sh index 12b066bd..e5496c1a 100755 --- a/fdroid/build.sh +++ b/fdroid/build.sh @@ -1,9 +1,49 @@ #!/bin/bash +if [ ! $# -eq 5 ]; then + echo "Usage: build.sh release version-code arch ninja-target" 1>&2 + exit 1 +fi + +RELEASE="$1" +VER_CODE="$2" +ARCH="$3" +NINJA_TARGET="$4" + +OUTPUT="out/Release_${RELEASE}_${ARCH}" + set -e +## sync starts in fdroiddata/build/$PKG echo "BUILD from $PWD" -. depot-tools.env +. common -echo "BUILD" +cd ../.. + +## create output directory - preserve if exists but make sure it's a symlink within srclibs/src +mkdir -p "$OUTPUT" +if [ -e srclib/src/out ]; then + unlink srclib/src/out +fi +ln -s "$PWD/out" srclib/src/out + +## from base/build_time.cc +# BUILD_DATE is exactly "Mmm DD YYYY HH:MM:SS". +# See //build/write_build_date_header.py. "HH:MM:SS" is normally expected to +# be "05:00:00" +BDATE="$(date +'%b %d %Y') 05:00:00" + +## read all arguments from file, skip comments +GN_ARGS="$(sed 's~ *#.*$~~' $PKG/fdroid/GN_ARGS | grep -v ^$ | tr '\n' ' ')" + +cd srclib/src + +gn gen "--args=android_default_version_code=\"${VER_CODE}\" android_default_version_name=\"$RELEASE\" override_build_date=\"$BDATE\" target_cpu=\"$ARCH\" $GN_ARGS" "$OUTPUT" + +## concurrency level for ninja +CONC=$(nproc) +let CONC+=1 + +##NOTE: can't use exit code to identify interrupts until https://github.com/ninja-build/ninja/issues/430 is addressed +NINJA_STATUS="%f/%t (%p) %es | " ionice --class 3 nice --adjustment=5 ninja -j$CONC -C "$OUTPUT" ${NINJA_TARGET} diff --git a/fdroid/common b/fdroid/common new file mode 100644 index 00000000..15f68af3 --- /dev/null +++ b/fdroid/common @@ -0,0 +1,9 @@ + +## rename main repo & restore it on exit +mv ../../srclib/chromium ../../srclib/src +trap "mv '$PWD/../../srclib/src' '$PWD/../../srclib/chromium'" EXIT + +export DEPOT_TOOLS="$PWD/../../srclib/DepotTools" +export PATH="$DEPOT_TOOLS:$PATH" + +PKG=org.bromite.bromite diff --git a/fdroid/depot-tools.env b/fdroid/depot-tools.env deleted file mode 100644 index 816b7cee..00000000 --- a/fdroid/depot-tools.env +++ /dev/null @@ -1,3 +0,0 @@ - -export DEPOT_TOOLS="$PWD/build/srclibs/DepotTools -export PATH="$DEPOT_TOOLS:$PATH" diff --git a/fdroid/gclient-prepare.sh b/fdroid/gclient-prepare.sh index 295e592e..bea1e2f1 100755 --- a/fdroid/gclient-prepare.sh +++ b/fdroid/gclient-prepare.sh @@ -6,844 +6,726 @@ # set -e -BASE="$PWD" - -cd srcvol - -## setup chromium-SPIRV-Tools into src/third_party/SPIRV-Tools/src -mkdir -p "src/third_party/SPIRV-Tools" -if [ -e "src/third_party/SPIRV-Tools/src" ]; then - echo "ERROR: src/third_party/SPIRV-Tools/src exists, cannot create symlink" 1>&2 - exit 1 +## setup chromium-py into src/third_party/webdriver/pylib +mkdir -p "src/third_party/webdriver" +if [ -e "src/third_party/webdriver/pylib" ]; then + rm -rfv "src/third_party/webdriver/pylib" fi -ln -v -s "$BASE/build/srclib/chromium-SPIRV-Tools" "src/third_party/SPIRV-Tools/src" +ln -v -s "$PWD/chromium-py" "src/third_party/webdriver/pylib" -## setup chromium-SwiftShader into src/third_party/swiftshader -mkdir -p "src/third_party" -if [ -e "src/third_party/swiftshader" ]; then - echo "ERROR: src/third_party/swiftshader exists, cannot create symlink" 1>&2 - exit 1 +## setup chromium-v8 into src/v8 +mkdir -p "src" +if [ -e "src/v8" ]; then + rm -rfv "src/v8" fi -ln -v -s "$BASE/build/srclib/chromium-SwiftShader" "src/third_party/swiftshader" - -## setup chromium-acid3 into src/tools/page_cycler/acid3 -mkdir -p "src/tools/page_cycler" -if [ -e "src/tools/page_cycler/acid3" ]; then - echo "ERROR: src/tools/page_cycler/acid3 exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-acid3" "src/tools/page_cycler/acid3" - -## setup chromium-android_ndk into src/third_party/android_ndk -if [ -e "src/third_party/android_ndk" ]; then - echo "ERROR: src/third_party/android_ndk exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-android_ndk" "src/third_party/android_ndk" - -## setup chromium-android_ndk into src/third_party/android_tools/ndk -mkdir -p "src/third_party/android_tools" -if [ -e "src/third_party/android_tools/ndk" ]; then - echo "ERROR: src/third_party/android_tools/ndk exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-android_ndk" "src/third_party/android_tools/ndk" - -## setup chromium-android_protobuf into src/third_party/android_protobuf/src -mkdir -p "src/third_party/android_protobuf" -if [ -e "src/third_party/android_protobuf/src" ]; then - echo "ERROR: src/third_party/android_protobuf/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-android_protobuf" "src/third_party/android_protobuf/src" - -## setup chromium-android_tools into src/third_party/android_tools -if [ -e "src/third_party/android_tools" ]; then - echo "ERROR: src/third_party/android_tools exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-android_tools" "src/third_party/android_tools" - -## setup chromium-angle into src/third_party/angle -if [ -e "src/third_party/angle" ]; then - echo "ERROR: src/third_party/angle exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-angle" "src/third_party/angle" +ln -v -s "$PWD/chromium-v8" "src/v8" ## setup chromium-aom into src/third_party/libaom/source/libaom mkdir -p "src/third_party/libaom/source" if [ -e "src/third_party/libaom/source/libaom" ]; then - echo "ERROR: src/third_party/libaom/source/libaom exists, cannot create symlink" 1>&2 - exit 1 + rm -rfv "src/third_party/libaom/source/libaom" fi -ln -v -s "$BASE/build/srclib/chromium-aom" "src/third_party/libaom/source/libaom" - -## setup chromium-apache-portable-runtime into src/third_party/apache-portable-runtime/src -mkdir -p "src/third_party/apache-portable-runtime" -if [ -e "src/third_party/apache-portable-runtime/src" ]; then - echo "ERROR: src/third_party/apache-portable-runtime/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-apache-portable-runtime" "src/third_party/apache-portable-runtime/src" - -## setup chromium-auto into src/third_party/auto/src -mkdir -p "src/third_party/auto" -if [ -e "src/third_party/auto/src" ]; then - echo "ERROR: src/third_party/auto/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-auto" "src/third_party/auto/src" - -## setup chromium-boringssl into src/third_party/boringssl/src -mkdir -p "src/third_party/boringssl" -if [ -e "src/third_party/boringssl/src" ]; then - echo "ERROR: src/third_party/boringssl/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-boringssl" "src/third_party/boringssl/src" - -## setup chromium-breakpad into src/third_party/breakpad/breakpad -mkdir -p "src/third_party/breakpad" -if [ -e "src/third_party/breakpad/breakpad" ]; then - echo "ERROR: src/third_party/breakpad/breakpad exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-breakpad" "src/third_party/breakpad/breakpad" - -## setup chromium-buildtools into src/buildtools -mkdir -p "src" -if [ -e "src/buildtools" ]; then - echo "ERROR: src/buildtools exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-buildtools" "src/buildtools" - -## setup chromium-canvas_bench into src/chrome/test/data/perf/canvas_bench -mkdir -p "src/chrome/test/data/perf" -if [ -e "src/chrome/test/data/perf/canvas_bench" ]; then - echo "ERROR: src/chrome/test/data/perf/canvas_bench exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-canvas_bench" "src/chrome/test/data/perf/canvas_bench" - -## setup chromium-catapult into src/third_party/catapult -if [ -e "src/third_party/catapult" ]; then - echo "ERROR: src/third_party/catapult exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-catapult" "src/third_party/catapult" +ln -v -s "$PWD/chromium-aom" "src/third_party/libaom/source/libaom" ## setup chromium-cdm into src/media/cdm/api mkdir -p "src/media/cdm" if [ -e "src/media/cdm/api" ]; then - echo "ERROR: src/media/cdm/api exists, cannot create symlink" 1>&2 - exit 1 + rm -rfv "src/media/cdm/api" fi -ln -v -s "$BASE/build/srclib/chromium-cdm" "src/media/cdm/api" - -## setup chromium-chromite into src/third_party/chromite -if [ -e "src/third_party/chromite" ]; then - echo "ERROR: src/third_party/chromite exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-chromite" "src/third_party/chromite" - -## setup chromium-clang-format into src/buildtools/clang_format/script -mkdir -p "src/buildtools/clang_format" -if [ -e "src/buildtools/clang_format/script" ]; then - echo "ERROR: src/buildtools/clang_format/script exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-clang-format" "src/buildtools/clang_format/script" - -## setup chromium-cld_3 into src/third_party/cld_3/src -mkdir -p "src/third_party/cld_3" -if [ -e "src/third_party/cld_3/src" ]; then - echo "ERROR: src/third_party/cld_3/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-cld_3" "src/third_party/cld_3/src" - -## setup chromium-client-py into src/tools/swarming_client -mkdir -p "src/tools" -if [ -e "src/tools/swarming_client" ]; then - echo "ERROR: src/tools/swarming_client exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-client-py" "src/tools/swarming_client" - -## setup chromium-colorama into src/third_party/colorama/src -mkdir -p "src/third_party/colorama" -if [ -e "src/third_party/colorama/src" ]; then - echo "ERROR: src/third_party/colorama/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-colorama" "src/third_party/colorama/src" - -## setup chromium-compact_enc_det into src/third_party/ced/src -mkdir -p "src/third_party/ced" -if [ -e "src/third_party/ced/src" ]; then - echo "ERROR: src/third_party/ced/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-compact_enc_det" "src/third_party/ced/src" - -## setup chromium-content into src/chrome/test/data/perf/frame_rate/content -mkdir -p "src/chrome/test/data/perf/frame_rate" -if [ -e "src/chrome/test/data/perf/frame_rate/content" ]; then - echo "ERROR: src/chrome/test/data/perf/frame_rate/content exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-content" "src/chrome/test/data/perf/frame_rate/content" - -## setup chromium-crc32c into src/third_party/crc32c/src -mkdir -p "src/third_party/crc32c" -if [ -e "src/third_party/crc32c/src" ]; then - echo "ERROR: src/third_party/crc32c/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-crc32c" "src/third_party/crc32c/src" - -## setup chromium-custom-tabs-client into src/third_party/custom_tabs_client/src -mkdir -p "src/third_party/custom_tabs_client" -if [ -e "src/third_party/custom_tabs_client/src" ]; then - echo "ERROR: src/third_party/custom_tabs_client/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-custom-tabs-client" "src/third_party/custom_tabs_client/src" - -## setup DepotTools into src/third_party/depot_tools -if [ -e "src/third_party/depot_tools" ]; then - echo "ERROR: src/third_party/depot_tools exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/DepotTools" "src/third_party/depot_tools" - -## setup chromium-deqp into src/third_party/deqp/src -mkdir -p "src/third_party/deqp" -if [ -e "src/third_party/deqp/src" ]; then - echo "ERROR: src/third_party/deqp/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-deqp" "src/third_party/deqp/src" - -## setup chromium-devtools-node-modules into src/third_party/devtools-node-modules -if [ -e "src/third_party/devtools-node-modules" ]; then - echo "ERROR: src/third_party/devtools-node-modules exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-devtools-node-modules" "src/third_party/devtools-node-modules" - -## setup chromium-dist into src/third_party/dom_distiller_js/dist -mkdir -p "src/third_party/dom_distiller_js" -if [ -e "src/third_party/dom_distiller_js/dist" ]; then - echo "ERROR: src/third_party/dom_distiller_js/dist exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-dist" "src/third_party/dom_distiller_js/dist" - -## setup chromium-elfutils into src/third_party/elfutils/src -mkdir -p "src/third_party/elfutils" -if [ -e "src/third_party/elfutils/src" ]; then - echo "ERROR: src/third_party/elfutils/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-elfutils" "src/third_party/elfutils/src" - -## setup chromium-errorprone into src/third_party/errorprone/lib -mkdir -p "src/third_party/errorprone" -if [ -e "src/third_party/errorprone/lib" ]; then - echo "ERROR: src/third_party/errorprone/lib exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-errorprone" "src/third_party/errorprone/lib" - -## setup chromium-ffmpeg into src/third_party/ffmpeg -if [ -e "src/third_party/ffmpeg" ]; then - echo "ERROR: src/third_party/ffmpeg exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-ffmpeg" "src/third_party/ffmpeg" - -## setup chromium-findbugs into src/third_party/findbugs -if [ -e "src/third_party/findbugs" ]; then - echo "ERROR: src/third_party/findbugs exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-findbugs" "src/third_party/findbugs" - -## setup chromium-flac into src/third_party/flac -if [ -e "src/third_party/flac" ]; then - echo "ERROR: src/third_party/flac exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-flac" "src/third_party/flac" - -## setup chromium-flatbuffers into src/third_party/flatbuffers/src -mkdir -p "src/third_party/flatbuffers" -if [ -e "src/third_party/flatbuffers/src" ]; then - echo "ERROR: src/third_party/flatbuffers/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-flatbuffers" "src/third_party/flatbuffers/src" - -## setup chromium-fontconfig into src/third_party/fontconfig/src -mkdir -p "src/third_party/fontconfig" -if [ -e "src/third_party/fontconfig/src" ]; then - echo "ERROR: src/third_party/fontconfig/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-fontconfig" "src/third_party/fontconfig/src" - -## setup chromium-freetype2 into src/third_party/freetype/src -mkdir -p "src/third_party/freetype" -if [ -e "src/third_party/freetype/src" ]; then - echo "ERROR: src/third_party/freetype/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-freetype2" "src/third_party/freetype/src" - -## setup chromium-fuzzer into src/third_party/libFuzzer/src -mkdir -p "src/third_party/libFuzzer" -if [ -e "src/third_party/libFuzzer/src" ]; then - echo "ERROR: src/third_party/libFuzzer/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-fuzzer" "src/third_party/libFuzzer/src" - -## setup chromium-gestures into src/third_party/gestures/gestures -mkdir -p "src/third_party/gestures" -if [ -e "src/third_party/gestures/gestures" ]; then - echo "ERROR: src/third_party/gestures/gestures exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-gestures" "src/third_party/gestures/gestures" - -## setup chromium-glslang into src/third_party/glslang/src -mkdir -p "src/third_party/glslang" -if [ -e "src/third_party/glslang/src" ]; then - echo "ERROR: src/third_party/glslang/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-glslang" "src/third_party/glslang/src" - -## setup chromium-glslang-angle into src/third_party/glslang-angle/src -mkdir -p "src/third_party/glslang-angle" -if [ -e "src/third_party/glslang-angle/src" ]; then - echo "ERROR: src/third_party/glslang-angle/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-glslang-angle" "src/third_party/glslang-angle/src" - -## setup chromium-googletest into src/third_party/googletest/src -mkdir -p "src/third_party/googletest" -if [ -e "src/third_party/googletest/src" ]; then - echo "ERROR: src/third_party/googletest/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-googletest" "src/third_party/googletest/src" - -## setup chromium-gvr-android-sdk into src/third_party/gvr-android-sdk/src -mkdir -p "src/third_party/gvr-android-sdk" -if [ -e "src/third_party/gvr-android-sdk/src" ]; then - echo "ERROR: src/third_party/gvr-android-sdk/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-gvr-android-sdk" "src/third_party/gvr-android-sdk/src" +ln -v -s "$PWD/chromium-cdm" "src/media/cdm/api" ## setup chromium-gyp into src/tools/gyp +mkdir -p "src/tools" if [ -e "src/tools/gyp" ]; then - echo "ERROR: src/tools/gyp exists, cannot create symlink" 1>&2 - exit 1 + rm -rfv "src/tools/gyp" fi -ln -v -s "$BASE/build/srclib/chromium-gyp" "src/tools/gyp" - -## setup chromium-hunspell_dictionaries into src/third_party/hunspell_dictionaries -if [ -e "src/third_party/hunspell_dictionaries" ]; then - echo "ERROR: src/third_party/hunspell_dictionaries exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-hunspell_dictionaries" "src/third_party/hunspell_dictionaries" +ln -v -s "$PWD/chromium-gyp" "src/tools/gyp" ## setup chromium-icu into src/third_party/icu +mkdir -p "src/third_party" if [ -e "src/third_party/icu" ]; then - echo "ERROR: src/third_party/icu exists, cannot create symlink" 1>&2 - exit 1 + rm -rfv "src/third_party/icu" fi -ln -v -s "$BASE/build/srclib/chromium-icu" "src/third_party/icu" - -## setup chromium-jsoncpp into src/third_party/jsoncpp/source -mkdir -p "src/third_party/jsoncpp" -if [ -e "src/third_party/jsoncpp/source" ]; then - echo "ERROR: src/third_party/jsoncpp/source exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-jsoncpp" "src/third_party/jsoncpp/source" - -## setup chromium-jsr-305 into src/third_party/jsr-305/src -mkdir -p "src/third_party/jsr-305" -if [ -e "src/third_party/jsr-305/src" ]; then - echo "ERROR: src/third_party/jsr-305/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-jsr-305" "src/third_party/jsr-305/src" - -## setup chromium-junit into src/third_party/junit/src -mkdir -p "src/third_party/junit" -if [ -e "src/third_party/junit/src" ]; then - echo "ERROR: src/third_party/junit/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-junit" "src/third_party/junit/src" - -## setup chromium-leakcanary into src/third_party/leakcanary/src -mkdir -p "src/third_party/leakcanary" -if [ -e "src/third_party/leakcanary/src" ]; then - echo "ERROR: src/third_party/leakcanary/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-leakcanary" "src/third_party/leakcanary/src" - -## setup chromium-leveldb into src/third_party/leveldatabase/src -mkdir -p "src/third_party/leveldatabase" -if [ -e "src/third_party/leveldatabase/src" ]; then - echo "ERROR: src/third_party/leveldatabase/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-leveldb" "src/third_party/leveldatabase/src" +ln -v -s "$PWD/chromium-icu" "src/third_party/icu" ## setup chromium-lib into src/third_party/bidichecker if [ -e "src/third_party/bidichecker" ]; then - echo "ERROR: src/third_party/bidichecker exists, cannot create symlink" 1>&2 - exit 1 + rm -rfv "src/third_party/bidichecker" fi -ln -v -s "$BASE/build/srclib/chromium-lib" "src/third_party/bidichecker" - -## setup chromium-libaddressinput into src/third_party/libaddressinput/src -mkdir -p "src/third_party/libaddressinput" -if [ -e "src/third_party/libaddressinput/src" ]; then - echo "ERROR: src/third_party/libaddressinput/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-libaddressinput" "src/third_party/libaddressinput/src" - -## setup chromium-libcxx into src/buildtools/third_party/libc++/trunk -mkdir -p "src/buildtools/third_party/libc++" -if [ -e "src/buildtools/third_party/libc++/trunk" ]; then - echo "ERROR: src/buildtools/third_party/libc++/trunk exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-libcxx" "src/buildtools/third_party/libc++/trunk" - -## setup chromium-libcxxabi into src/buildtools/third_party/libc++abi/trunk -mkdir -p "src/buildtools/third_party/libc++abi" -if [ -e "src/buildtools/third_party/libc++abi/trunk" ]; then - echo "ERROR: src/buildtools/third_party/libc++abi/trunk exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-libcxxabi" "src/buildtools/third_party/libc++abi/trunk" - -## setup chromium-libdrm into src/third_party/libdrm/src -mkdir -p "src/third_party/libdrm" -if [ -e "src/third_party/libdrm/src" ]; then - echo "ERROR: src/third_party/libdrm/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-libdrm" "src/third_party/libdrm/src" - -## setup chromium-libevdev into src/third_party/libevdev/src -mkdir -p "src/third_party/libevdev" -if [ -e "src/third_party/libevdev/src" ]; then - echo "ERROR: src/third_party/libevdev/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-libevdev" "src/third_party/libevdev/src" - -## setup chromium-libjpeg_turbo into src/third_party/libjpeg_turbo -if [ -e "src/third_party/libjpeg_turbo" ]; then - echo "ERROR: src/third_party/libjpeg_turbo exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-libjpeg_turbo" "src/third_party/libjpeg_turbo" - -## setup chromium-liblouis-github into src/third_party/liblouis/src -mkdir -p "src/third_party/liblouis" -if [ -e "src/third_party/liblouis/src" ]; then - echo "ERROR: src/third_party/liblouis/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-liblouis-github" "src/third_party/liblouis/src" - -## setup chromium-libphonenumber into src/third_party/libphonenumber/dist -mkdir -p "src/third_party/libphonenumber" -if [ -e "src/third_party/libphonenumber/dist" ]; then - echo "ERROR: src/third_party/libphonenumber/dist exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-libphonenumber" "src/third_party/libphonenumber/dist" - -## setup chromium-libprotobuf-mutator into src/third_party/libprotobuf-mutator/src -mkdir -p "src/third_party/libprotobuf-mutator" -if [ -e "src/third_party/libprotobuf-mutator/src" ]; then - echo "ERROR: src/third_party/libprotobuf-mutator/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-libprotobuf-mutator" "src/third_party/libprotobuf-mutator/src" - -## setup chromium-libsrtp into src/third_party/libsrtp -if [ -e "src/third_party/libsrtp" ]; then - echo "ERROR: src/third_party/libsrtp exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-libsrtp" "src/third_party/libsrtp" - -## setup chromium-libsync into src/third_party/libsync/src -mkdir -p "src/third_party/libsync" -if [ -e "src/third_party/libsync/src" ]; then - echo "ERROR: src/third_party/libsync/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-libsync" "src/third_party/libsync/src" - -## setup chromium-libunwind into src/buildtools/third_party/libunwind/trunk -mkdir -p "src/buildtools/third_party/libunwind" -if [ -e "src/buildtools/third_party/libunwind/trunk" ]; then - echo "ERROR: src/buildtools/third_party/libunwind/trunk exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-libunwind" "src/buildtools/third_party/libunwind/trunk" - -## setup chromium-libvpx into src/third_party/libvpx/source/libvpx -mkdir -p "src/third_party/libvpx/source" -if [ -e "src/third_party/libvpx/source/libvpx" ]; then - echo "ERROR: src/third_party/libvpx/source/libvpx exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-libvpx" "src/third_party/libvpx/source/libvpx" - -## setup chromium-libwebm into src/third_party/libwebm/source -mkdir -p "src/third_party/libwebm" -if [ -e "src/third_party/libwebm/source" ]; then - echo "ERROR: src/third_party/libwebm/source exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-libwebm" "src/third_party/libwebm/source" - -## setup chromium-libyuv into src/third_party/libyuv -if [ -e "src/third_party/libyuv" ]; then - echo "ERROR: src/third_party/libyuv exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-libyuv" "src/third_party/libyuv" - -## setup chromium-linux-syscall-support into src/third_party/lss -if [ -e "src/third_party/lss" ]; then - echo "ERROR: src/third_party/lss exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-linux-syscall-support" "src/third_party/lss" - -## setup chromium-mesa into src/third_party/mesa/src -mkdir -p "src/third_party/mesa" -if [ -e "src/third_party/mesa/src" ]; then - echo "ERROR: src/third_party/mesa/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-mesa" "src/third_party/mesa/src" - -## setup chromium-minigbm into src/third_party/minigbm/src -mkdir -p "src/third_party/minigbm" -if [ -e "src/third_party/minigbm/src" ]; then - echo "ERROR: src/third_party/minigbm/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-minigbm" "src/third_party/minigbm/src" - -## setup chromium-minizip into src/third_party/minizip/src -mkdir -p "src/third_party/minizip" -if [ -e "src/third_party/minizip/src" ]; then - echo "ERROR: src/third_party/minizip/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-minizip" "src/third_party/minizip/src" - -## setup chromium-mockito into src/third_party/mockito/src -mkdir -p "src/third_party/mockito" -if [ -e "src/third_party/mockito/src" ]; then - echo "ERROR: src/third_party/mockito/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-mockito" "src/third_party/mockito/src" - -## setup chromium-native_client into src/native_client -if [ -e "src/native_client" ]; then - echo "ERROR: src/native_client exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-native_client" "src/native_client" - -## setup chromium-netty-tcnative into src/third_party/netty-tcnative/src -mkdir -p "src/third_party/netty-tcnative" -if [ -e "src/third_party/netty-tcnative/src" ]; then - echo "ERROR: src/third_party/netty-tcnative/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-netty-tcnative" "src/third_party/netty-tcnative/src" - -## setup chromium-netty4 into src/third_party/netty4/src -mkdir -p "src/third_party/netty4" -if [ -e "src/third_party/netty4/src" ]; then - echo "ERROR: src/third_party/netty4/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-netty4" "src/third_party/netty4/src" - -## setup chromium-openh264 into src/third_party/openh264/src -mkdir -p "src/third_party/openh264" -if [ -e "src/third_party/openh264/src" ]; then - echo "ERROR: src/third_party/openh264/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-openh264" "src/third_party/openh264/src" - -## setup chromium-openmax into src/third_party/openmax_dl -if [ -e "src/third_party/openmax_dl" ]; then - echo "ERROR: src/third_party/openmax_dl exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-openmax" "src/third_party/openmax_dl" - -## setup chromium-patched-yasm into src/third_party/yasm/source/patched-yasm -mkdir -p "src/third_party/yasm/source" -if [ -e "src/third_party/yasm/source/patched-yasm" ]; then - echo "ERROR: src/third_party/yasm/source/patched-yasm exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-patched-yasm" "src/third_party/yasm/source/patched-yasm" - -## setup chromium-pdfium into src/third_party/pdfium -if [ -e "src/third_party/pdfium" ]; then - echo "ERROR: src/third_party/pdfium exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-pdfium" "src/third_party/pdfium" - -## setup chromium-perfetto into src/third_party/perfetto -if [ -e "src/third_party/perfetto" ]; then - echo "ERROR: src/third_party/perfetto exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-perfetto" "src/third_party/perfetto" - -## setup chromium-py into src/third_party/webdriver/pylib -mkdir -p "src/third_party/webdriver" -if [ -e "src/third_party/webdriver/pylib" ]; then - echo "ERROR: src/third_party/webdriver/pylib exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-py" "src/third_party/webdriver/pylib" - -## setup chromium-pyelftools into src/third_party/pyelftools -if [ -e "src/third_party/pyelftools" ]; then - echo "ERROR: src/third_party/pyelftools exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-pyelftools" "src/third_party/pyelftools" - -## setup chromium-pyftpdlib into src/third_party/pyftpdlib/src -mkdir -p "src/third_party/pyftpdlib" -if [ -e "src/third_party/pyftpdlib/src" ]; then - echo "ERROR: src/third_party/pyftpdlib/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-pyftpdlib" "src/third_party/pyftpdlib/src" - -## setup chromium-pywebsocket into src/third_party/pywebsocket/src -mkdir -p "src/third_party/pywebsocket" -if [ -e "src/third_party/pywebsocket/src" ]; then - echo "ERROR: src/third_party/pywebsocket/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-pywebsocket" "src/third_party/pywebsocket/src" +ln -v -s "$PWD/chromium-lib" "src/third_party/bidichecker" ## setup chromium-re2 into src/third_party/re2/src mkdir -p "src/third_party/re2" if [ -e "src/third_party/re2/src" ]; then - echo "ERROR: src/third_party/re2/src exists, cannot create symlink" 1>&2 - exit 1 + rm -rfv "src/third_party/re2/src" fi -ln -v -s "$BASE/build/srclib/chromium-re2" "src/third_party/re2/src" - -## setup chromium-requests into src/third_party/requests/src -mkdir -p "src/third_party/requests" -if [ -e "src/third_party/requests/src" ]; then - echo "ERROR: src/third_party/requests/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-requests" "src/third_party/requests/src" - -## setup chromium-robolectric into src/third_party/robolectric/robolectric -mkdir -p "src/third_party/robolectric" -if [ -e "src/third_party/robolectric/robolectric" ]; then - echo "ERROR: src/third_party/robolectric/robolectric exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-robolectric" "src/third_party/robolectric/robolectric" - -## setup chromium-sfntly into src/third_party/sfntly/src -mkdir -p "src/third_party/sfntly" -if [ -e "src/third_party/sfntly/src" ]; then - echo "ERROR: src/third_party/sfntly/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-sfntly" "src/third_party/sfntly/src" - -## setup chromium-shaderc into src/third_party/shaderc/src -mkdir -p "src/third_party/shaderc" -if [ -e "src/third_party/shaderc/src" ]; then - echo "ERROR: src/third_party/shaderc/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-shaderc" "src/third_party/shaderc/src" - -## setup chromium-skia into src/third_party/skia -if [ -e "src/third_party/skia" ]; then - echo "ERROR: src/third_party/skia exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-skia" "src/third_party/skia" - -## setup chromium-smhasher into src/third_party/smhasher/src -mkdir -p "src/third_party/smhasher" -if [ -e "src/third_party/smhasher/src" ]; then - echo "ERROR: src/third_party/smhasher/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-smhasher" "src/third_party/smhasher/src" - -## setup chromium-snappy into src/third_party/snappy/src -mkdir -p "src/third_party/snappy" -if [ -e "src/third_party/snappy/src" ]; then - echo "ERROR: src/third_party/snappy/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-snappy" "src/third_party/snappy/src" - -## setup chromium-spirv-headers into src/third_party/spirv-headers/src -mkdir -p "src/third_party/spirv-headers" -if [ -e "src/third_party/spirv-headers/src" ]; then - echo "ERROR: src/third_party/spirv-headers/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-spirv-headers" "src/third_party/spirv-headers/src" - -## setup chromium-spirv-tools into src/third_party/spirv-tools-angle/src -mkdir -p "src/third_party/spirv-tools-angle" -if [ -e "src/third_party/spirv-tools-angle/src" ]; then - echo "ERROR: src/third_party/spirv-tools-angle/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-spirv-tools" "src/third_party/spirv-tools-angle/src" +ln -v -s "$PWD/chromium-re2" "src/third_party/re2/src" ## setup chromium-src into src/third_party/webrtc if [ -e "src/third_party/webrtc" ]; then - echo "ERROR: src/third_party/webrtc exists, cannot create symlink" 1>&2 - exit 1 + rm -rfv "src/third_party/webrtc" fi -ln -v -s "$BASE/build/srclib/chromium-src" "src/third_party/webrtc" - -## setup chromium-system_api into src/third_party/cros_system_api -if [ -e "src/third_party/cros_system_api" ]; then - echo "ERROR: src/third_party/cros_system_api exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-system_api" "src/third_party/cros_system_api" - -## setup chromium-ub-uiautomator into src/third_party/ub-uiautomator/lib -mkdir -p "src/third_party/ub-uiautomator" -if [ -e "src/third_party/ub-uiautomator/lib" ]; then - echo "ERROR: src/third_party/ub-uiautomator/lib exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-ub-uiautomator" "src/third_party/ub-uiautomator/lib" - -## setup chromium-usrsctp into src/third_party/usrsctp/usrsctplib -mkdir -p "src/third_party/usrsctp" -if [ -e "src/third_party/usrsctp/usrsctplib" ]; then - echo "ERROR: src/third_party/usrsctp/usrsctplib exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-usrsctp" "src/third_party/usrsctp/usrsctplib" - -## setup chromium-v8 into src/v8 -if [ -e "src/v8" ]; then - echo "ERROR: src/v8 exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-v8" "src/v8" - -## setup chromium-visualmetrics into src/third_party/visualmetrics/src -mkdir -p "src/third_party/visualmetrics" -if [ -e "src/third_party/visualmetrics/src" ]; then - echo "ERROR: src/third_party/visualmetrics/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-visualmetrics" "src/third_party/visualmetrics/src" - -## setup chromium-vulkan-validation-layers into src/third_party/vulkan-validation-layers/src -mkdir -p "src/third_party/vulkan-validation-layers" -if [ -e "src/third_party/vulkan-validation-layers/src" ]; then - echo "ERROR: src/third_party/vulkan-validation-layers/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-vulkan-validation-layers" "src/third_party/vulkan-validation-layers/src" - -## setup chromium-wayland into src/third_party/wayland/src -mkdir -p "src/third_party/wayland" -if [ -e "src/third_party/wayland/src" ]; then - echo "ERROR: src/third_party/wayland/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-wayland" "src/third_party/wayland/src" - -## setup chromium-wayland-protocols into src/third_party/wayland-protocols/src -mkdir -p "src/third_party/wayland-protocols" -if [ -e "src/third_party/wayland-protocols/src" ]; then - echo "ERROR: src/third_party/wayland-protocols/src exists, cannot create symlink" 1>&2 - exit 1 -fi -ln -v -s "$BASE/build/srclib/chromium-wayland-protocols" "src/third_party/wayland-protocols/src" +ln -v -s "$PWD/chromium-src" "src/third_party/webrtc" ## setup chromium-wds into src/third_party/wds/src mkdir -p "src/third_party/wds" if [ -e "src/third_party/wds/src" ]; then - echo "ERROR: src/third_party/wds/src exists, cannot create symlink" 1>&2 - exit 1 + rm -rfv "src/third_party/wds/src" fi -ln -v -s "$BASE/build/srclib/chromium-wds" "src/third_party/wds/src" +ln -v -s "$PWD/chromium-wds" "src/third_party/wds/src" + +## setup chromium-auto into src/third_party/auto/src +mkdir -p "src/third_party/auto" +if [ -e "src/third_party/auto/src" ]; then + rm -rfv "src/third_party/auto/src" +fi +ln -v -s "$PWD/chromium-auto" "src/third_party/auto/src" + +## setup chromium-deqp into src/third_party/deqp/src +mkdir -p "src/third_party/deqp" +if [ -e "src/third_party/deqp/src" ]; then + rm -rfv "src/third_party/deqp/src" +fi +ln -v -s "$PWD/chromium-deqp" "src/third_party/deqp/src" + +## setup chromium-dist into src/third_party/dom_distiller_js/dist +mkdir -p "src/third_party/dom_distiller_js" +if [ -e "src/third_party/dom_distiller_js/dist" ]; then + rm -rfv "src/third_party/dom_distiller_js/dist" +fi +ln -v -s "$PWD/chromium-dist" "src/third_party/dom_distiller_js/dist" + +## setup chromium-flac into src/third_party/flac +if [ -e "src/third_party/flac" ]; then + rm -rfv "src/third_party/flac" +fi +ln -v -s "$PWD/chromium-flac" "src/third_party/flac" + +## setup chromium-mesa into src/third_party/mesa/src +mkdir -p "src/third_party/mesa" +if [ -e "src/third_party/mesa/src" ]; then + rm -rfv "src/third_party/mesa/src" +fi +ln -v -s "$PWD/chromium-mesa" "src/third_party/mesa/src" + +## setup chromium-skia into src/third_party/skia +if [ -e "src/third_party/skia" ]; then + rm -rfv "src/third_party/skia" +fi +ln -v -s "$PWD/chromium-skia" "src/third_party/skia" + +## setup chromium-acid3 into src/tools/page_cycler/acid3 +mkdir -p "src/tools/page_cycler" +if [ -e "src/tools/page_cycler/acid3" ]; then + rm -rfv "src/tools/page_cycler/acid3" +fi +ln -v -s "$PWD/chromium-acid3" "src/tools/page_cycler/acid3" + +## setup chromium-angle into src/third_party/angle +if [ -e "src/third_party/angle" ]; then + rm -rfv "src/third_party/angle" +fi +ln -v -s "$PWD/chromium-angle" "src/third_party/angle" + +## setup chromium-cld_3 into src/third_party/cld_3/src +mkdir -p "src/third_party/cld_3" +if [ -e "src/third_party/cld_3/src" ]; then + rm -rfv "src/third_party/cld_3/src" +fi +ln -v -s "$PWD/chromium-cld_3" "src/third_party/cld_3/src" + +## setup chromium-junit into src/third_party/junit/src +mkdir -p "src/third_party/junit" +if [ -e "src/third_party/junit/src" ]; then + rm -rfv "src/third_party/junit/src" +fi +ln -v -s "$PWD/chromium-junit" "src/third_party/junit/src" ## setup chromium-webgl into src/third_party/webgl/src mkdir -p "src/third_party/webgl" if [ -e "src/third_party/webgl/src" ]; then - echo "ERROR: src/third_party/webgl/src exists, cannot create symlink" 1>&2 - exit 1 + rm -rfv "src/third_party/webgl/src" fi -ln -v -s "$BASE/build/srclib/chromium-webgl" "src/third_party/webgl/src" +ln -v -s "$PWD/chromium-webgl" "src/third_party/webgl/src" + +## setup chromium-crc32c into src/third_party/crc32c/src +mkdir -p "src/third_party/crc32c" +if [ -e "src/third_party/crc32c/src" ]; then + rm -rfv "src/third_party/crc32c/src" +fi +ln -v -s "$PWD/chromium-crc32c" "src/third_party/crc32c/src" + +## setup chromium-ffmpeg into src/third_party/ffmpeg +if [ -e "src/third_party/ffmpeg" ]; then + rm -rfv "src/third_party/ffmpeg" +fi +ln -v -s "$PWD/chromium-ffmpeg" "src/third_party/ffmpeg" + +## setup chromium-fuzzer into src/third_party/libFuzzer/src +mkdir -p "src/third_party/libFuzzer" +if [ -e "src/third_party/libFuzzer/src" ]; then + rm -rfv "src/third_party/libFuzzer/src" +fi +ln -v -s "$PWD/chromium-fuzzer" "src/third_party/libFuzzer/src" + +## setup chromium-libcxx into src/buildtools/third_party/libc++/trunk +mkdir -p "src/buildtools/third_party/libc++" +if [ -e "src/buildtools/third_party/libc++/trunk" ]; then + rm -rfv "src/buildtools/third_party/libc++/trunk" +fi +ln -v -s "$PWD/chromium-libcxx" "src/buildtools/third_party/libc++/trunk" + +## setup chromium-libdrm into src/third_party/libdrm/src +mkdir -p "src/third_party/libdrm" +if [ -e "src/third_party/libdrm/src" ]; then + rm -rfv "src/third_party/libdrm/src" +fi +ln -v -s "$PWD/chromium-libdrm" "src/third_party/libdrm/src" + +## setup chromium-libvpx into src/third_party/libvpx/source/libvpx +mkdir -p "src/third_party/libvpx/source" +if [ -e "src/third_party/libvpx/source/libvpx" ]; then + rm -rfv "src/third_party/libvpx/source/libvpx" +fi +ln -v -s "$PWD/chromium-libvpx" "src/third_party/libvpx/source/libvpx" + +## setup chromium-libyuv into src/third_party/libyuv +if [ -e "src/third_party/libyuv" ]; then + rm -rfv "src/third_party/libyuv" +fi +ln -v -s "$PWD/chromium-libyuv" "src/third_party/libyuv" + +## setup chromium-netty4 into src/third_party/netty4/src +mkdir -p "src/third_party/netty4" +if [ -e "src/third_party/netty4/src" ]; then + rm -rfv "src/third_party/netty4/src" +fi +ln -v -s "$PWD/chromium-netty4" "src/third_party/netty4/src" + +## setup chromium-pdfium into src/third_party/pdfium +if [ -e "src/third_party/pdfium" ]; then + rm -rfv "src/third_party/pdfium" +fi +ln -v -s "$PWD/chromium-pdfium" "src/third_party/pdfium" + +## setup chromium-sfntly into src/third_party/sfntly/src +mkdir -p "src/third_party/sfntly" +if [ -e "src/third_party/sfntly/src" ]; then + rm -rfv "src/third_party/sfntly/src" +fi +ln -v -s "$PWD/chromium-sfntly" "src/third_party/sfntly/src" + +## setup chromium-snappy into src/third_party/snappy/src +mkdir -p "src/third_party/snappy" +if [ -e "src/third_party/snappy/src" ]; then + rm -rfv "src/third_party/snappy/src" +fi +ln -v -s "$PWD/chromium-snappy" "src/third_party/snappy/src" + +## setup chromium-content into src/chrome/test/data/perf/frame_rate/content +mkdir -p "src/chrome/test/data/perf/frame_rate" +if [ -e "src/chrome/test/data/perf/frame_rate/content" ]; then + rm -rfv "src/chrome/test/data/perf/frame_rate/content" +fi +ln -v -s "$PWD/chromium-content" "src/chrome/test/data/perf/frame_rate/content" + +## setup chromium-glslang into src/third_party/glslang/src +mkdir -p "src/third_party/glslang" +if [ -e "src/third_party/glslang/src" ]; then + rm -rfv "src/third_party/glslang/src" +fi +ln -v -s "$PWD/chromium-glslang" "src/third_party/glslang/src" + +## setup chromium-jsoncpp into src/third_party/jsoncpp/source +mkdir -p "src/third_party/jsoncpp" +if [ -e "src/third_party/jsoncpp/source" ]; then + rm -rfv "src/third_party/jsoncpp/source" +fi +ln -v -s "$PWD/chromium-jsoncpp" "src/third_party/jsoncpp/source" + +## setup chromium-jsr-305 into src/third_party/jsr-305/src +mkdir -p "src/third_party/jsr-305" +if [ -e "src/third_party/jsr-305/src" ]; then + rm -rfv "src/third_party/jsr-305/src" +fi +ln -v -s "$PWD/chromium-jsr-305" "src/third_party/jsr-305/src" + +## setup chromium-leveldb into src/third_party/leveldatabase/src +mkdir -p "src/third_party/leveldatabase" +if [ -e "src/third_party/leveldatabase/src" ]; then + rm -rfv "src/third_party/leveldatabase/src" +fi +ln -v -s "$PWD/chromium-leveldb" "src/third_party/leveldatabase/src" + +## setup chromium-libsrtp into src/third_party/libsrtp +if [ -e "src/third_party/libsrtp" ]; then + rm -rfv "src/third_party/libsrtp" +fi +ln -v -s "$PWD/chromium-libsrtp" "src/third_party/libsrtp" + +## setup chromium-libsync into src/third_party/libsync/src +mkdir -p "src/third_party/libsync" +if [ -e "src/third_party/libsync/src" ]; then + rm -rfv "src/third_party/libsync/src" +fi +ln -v -s "$PWD/chromium-libsync" "src/third_party/libsync/src" + +## setup chromium-libwebm into src/third_party/libwebm/source +mkdir -p "src/third_party/libwebm" +if [ -e "src/third_party/libwebm/source" ]; then + rm -rfv "src/third_party/libwebm/source" +fi +ln -v -s "$PWD/chromium-libwebm" "src/third_party/libwebm/source" + +## setup chromium-minigbm into src/third_party/minigbm/src +mkdir -p "src/third_party/minigbm" +if [ -e "src/third_party/minigbm/src" ]; then + rm -rfv "src/third_party/minigbm/src" +fi +ln -v -s "$PWD/chromium-minigbm" "src/third_party/minigbm/src" + +## setup chromium-minizip into src/third_party/minizip/src +mkdir -p "src/third_party/minizip" +if [ -e "src/third_party/minizip/src" ]; then + rm -rfv "src/third_party/minizip/src" +fi +ln -v -s "$PWD/chromium-minizip" "src/third_party/minizip/src" + +## setup chromium-mockito into src/third_party/mockito/src +mkdir -p "src/third_party/mockito" +if [ -e "src/third_party/mockito/src" ]; then + rm -rfv "src/third_party/mockito/src" +fi +ln -v -s "$PWD/chromium-mockito" "src/third_party/mockito/src" + +## setup chromium-openmax into src/third_party/openmax_dl +if [ -e "src/third_party/openmax_dl" ]; then + rm -rfv "src/third_party/openmax_dl" +fi +ln -v -s "$PWD/chromium-openmax" "src/third_party/openmax_dl" + +## setup chromium-shaderc into src/third_party/shaderc/src +mkdir -p "src/third_party/shaderc" +if [ -e "src/third_party/shaderc/src" ]; then + rm -rfv "src/third_party/shaderc/src" +fi +ln -v -s "$PWD/chromium-shaderc" "src/third_party/shaderc/src" + +## setup chromium-usrsctp into src/third_party/usrsctp/usrsctplib +mkdir -p "src/third_party/usrsctp" +if [ -e "src/third_party/usrsctp/usrsctplib" ]; then + rm -rfv "src/third_party/usrsctp/usrsctplib" +fi +ln -v -s "$PWD/chromium-usrsctp" "src/third_party/usrsctp/usrsctplib" + +## setup chromium-wayland into src/third_party/wayland/src +mkdir -p "src/third_party/wayland" +if [ -e "src/third_party/wayland/src" ]; then + rm -rfv "src/third_party/wayland/src" +fi +ln -v -s "$PWD/chromium-wayland" "src/third_party/wayland/src" + +## setup chromium-breakpad into src/third_party/breakpad/breakpad +mkdir -p "src/third_party/breakpad" +if [ -e "src/third_party/breakpad/breakpad" ]; then + rm -rfv "src/third_party/breakpad/breakpad" +fi +ln -v -s "$PWD/chromium-breakpad" "src/third_party/breakpad/breakpad" + +## setup chromium-catapult into src/third_party/catapult +if [ -e "src/third_party/catapult" ]; then + rm -rfv "src/third_party/catapult" +fi +ln -v -s "$PWD/chromium-catapult" "src/third_party/catapult" + +## setup chromium-chromite into src/third_party/chromite +if [ -e "src/third_party/chromite" ]; then + rm -rfv "src/third_party/chromite" +fi +ln -v -s "$PWD/chromium-chromite" "src/third_party/chromite" + +## setup chromium-colorama into src/third_party/colorama/src +mkdir -p "src/third_party/colorama" +if [ -e "src/third_party/colorama/src" ]; then + rm -rfv "src/third_party/colorama/src" +fi +ln -v -s "$PWD/chromium-colorama" "src/third_party/colorama/src" + +## setup chromium-elfutils into src/third_party/elfutils/src +mkdir -p "src/third_party/elfutils" +if [ -e "src/third_party/elfutils/src" ]; then + rm -rfv "src/third_party/elfutils/src" +fi +ln -v -s "$PWD/chromium-elfutils" "src/third_party/elfutils/src" + +## setup chromium-findbugs into src/third_party/findbugs +if [ -e "src/third_party/findbugs" ]; then + rm -rfv "src/third_party/findbugs" +fi +ln -v -s "$PWD/chromium-findbugs" "src/third_party/findbugs" + +## setup chromium-gestures into src/third_party/gestures/gestures +mkdir -p "src/third_party/gestures" +if [ -e "src/third_party/gestures/gestures" ]; then + rm -rfv "src/third_party/gestures/gestures" +fi +ln -v -s "$PWD/chromium-gestures" "src/third_party/gestures/gestures" + +## setup chromium-libevdev into src/third_party/libevdev/src +mkdir -p "src/third_party/libevdev" +if [ -e "src/third_party/libevdev/src" ]; then + rm -rfv "src/third_party/libevdev/src" +fi +ln -v -s "$PWD/chromium-libevdev" "src/third_party/libevdev/src" + +## setup chromium-openh264 into src/third_party/openh264/src +mkdir -p "src/third_party/openh264" +if [ -e "src/third_party/openh264/src" ]; then + rm -rfv "src/third_party/openh264/src" +fi +ln -v -s "$PWD/chromium-openh264" "src/third_party/openh264/src" + +## setup chromium-perfetto into src/third_party/perfetto +if [ -e "src/third_party/perfetto" ]; then + rm -rfv "src/third_party/perfetto" +fi +ln -v -s "$PWD/chromium-perfetto" "src/third_party/perfetto" + +## setup chromium-requests into src/third_party/requests/src +mkdir -p "src/third_party/requests" +if [ -e "src/third_party/requests/src" ]; then + rm -rfv "src/third_party/requests/src" +fi +ln -v -s "$PWD/chromium-requests" "src/third_party/requests/src" + +## setup chromium-smhasher into src/third_party/smhasher/src +mkdir -p "src/third_party/smhasher" +if [ -e "src/third_party/smhasher/src" ]; then + rm -rfv "src/third_party/smhasher/src" +fi +ln -v -s "$PWD/chromium-smhasher" "src/third_party/smhasher/src" + +## setup chromium-boringssl into src/third_party/boringssl/src +mkdir -p "src/third_party/boringssl" +if [ -e "src/third_party/boringssl/src" ]; then + rm -rfv "src/third_party/boringssl/src" +fi +ln -v -s "$PWD/chromium-boringssl" "src/third_party/boringssl/src" + +## setup chromium-client-py into src/tools/swarming_client +if [ -e "src/tools/swarming_client" ]; then + rm -rfv "src/tools/swarming_client" +fi +ln -v -s "$PWD/chromium-client-py" "src/tools/swarming_client" + +## setup chromium-freetype2 into src/third_party/freetype/src +mkdir -p "src/third_party/freetype" +if [ -e "src/third_party/freetype/src" ]; then + rm -rfv "src/third_party/freetype/src" +fi +ln -v -s "$PWD/chromium-freetype2" "src/third_party/freetype/src" + +## setup chromium-libcxxabi into src/buildtools/third_party/libc++abi/trunk +mkdir -p "src/buildtools/third_party/libc++abi" +if [ -e "src/buildtools/third_party/libc++abi/trunk" ]; then + rm -rfv "src/buildtools/third_party/libc++abi/trunk" +fi +ln -v -s "$PWD/chromium-libcxxabi" "src/buildtools/third_party/libc++abi/trunk" + +## setup chromium-libunwind into src/buildtools/third_party/libunwind/trunk +mkdir -p "src/buildtools/third_party/libunwind" +if [ -e "src/buildtools/third_party/libunwind/trunk" ]; then + rm -rfv "src/buildtools/third_party/libunwind/trunk" +fi +ln -v -s "$PWD/chromium-libunwind" "src/buildtools/third_party/libunwind/trunk" + +## setup chromium-pyftpdlib into src/third_party/pyftpdlib/src +mkdir -p "src/third_party/pyftpdlib" +if [ -e "src/third_party/pyftpdlib/src" ]; then + rm -rfv "src/third_party/pyftpdlib/src" +fi +ln -v -s "$PWD/chromium-pyftpdlib" "src/third_party/pyftpdlib/src" + +## setup chromium-xdg-utils into src/third_party/xdg-utils +if [ -e "src/third_party/xdg-utils" ]; then + rm -rfv "src/third_party/xdg-utils" +fi +ln -v -s "$PWD/chromium-xdg-utils" "src/third_party/xdg-utils" + +## setup chromium-buildtools into src/buildtools +if [ -e "src/buildtools" ]; then + rm -rfv "src/buildtools" +fi +ln -v -s "$PWD/chromium-buildtools" "src/buildtools" + +## setup chromium-errorprone into src/third_party/errorprone/lib +mkdir -p "src/third_party/errorprone" +if [ -e "src/third_party/errorprone/lib" ]; then + rm -rfv "src/third_party/errorprone/lib" +fi +ln -v -s "$PWD/chromium-errorprone" "src/third_party/errorprone/lib" + +## setup chromium-fontconfig into src/third_party/fontconfig/src +mkdir -p "src/third_party/fontconfig" +if [ -e "src/third_party/fontconfig/src" ]; then + rm -rfv "src/third_party/fontconfig/src" +fi +ln -v -s "$PWD/chromium-fontconfig" "src/third_party/fontconfig/src" + +## setup chromium-googletest into src/third_party/googletest/src +mkdir -p "src/third_party/googletest" +if [ -e "src/third_party/googletest/src" ]; then + rm -rfv "src/third_party/googletest/src" +fi +ln -v -s "$PWD/chromium-googletest" "src/third_party/googletest/src" + +## setup chromium-leakcanary into src/third_party/leakcanary/src +mkdir -p "src/third_party/leakcanary" +if [ -e "src/third_party/leakcanary/src" ]; then + rm -rfv "src/third_party/leakcanary/src" +fi +ln -v -s "$PWD/chromium-leakcanary" "src/third_party/leakcanary/src" + +## setup chromium-pyelftools into src/third_party/pyelftools +if [ -e "src/third_party/pyelftools" ]; then + rm -rfv "src/third_party/pyelftools" +fi +ln -v -s "$PWD/chromium-pyelftools" "src/third_party/pyelftools" + +## setup chromium-system_api into src/third_party/cros_system_api +if [ -e "src/third_party/cros_system_api" ]; then + rm -rfv "src/third_party/cros_system_api" +fi +ln -v -s "$PWD/chromium-system_api" "src/third_party/cros_system_api" ## setup chromium-webvr.info into src/chrome/test/data/vr/webvr_info mkdir -p "src/chrome/test/data/vr" if [ -e "src/chrome/test/data/vr/webvr_info" ]; then - echo "ERROR: src/chrome/test/data/vr/webvr_info exists, cannot create symlink" 1>&2 - exit 1 + rm -rfv "src/chrome/test/data/vr/webvr_info" fi -ln -v -s "$BASE/build/srclib/chromium-webvr.info" "src/chrome/test/data/vr/webvr_info" +ln -v -s "$PWD/chromium-webvr.info" "src/chrome/test/data/vr/webvr_info" -## setup chromium-xdg-utils into src/third_party/xdg-utils -if [ -e "src/third_party/xdg-utils" ]; then - echo "ERROR: src/third_party/xdg-utils exists, cannot create symlink" 1>&2 - exit 1 +## setup chromium-SPIRV-Tools into src/third_party/SPIRV-Tools/src +mkdir -p "src/third_party/SPIRV-Tools" +if [ -e "src/third_party/SPIRV-Tools/src" ]; then + rm -rfv "src/third_party/SPIRV-Tools/src" fi -ln -v -s "$BASE/build/srclib/chromium-xdg-utils" "src/third_party/xdg-utils" +ln -v -s "$PWD/chromium-SPIRV-Tools" "src/third_party/SPIRV-Tools/src" + +## setup chromium-SwiftShader into src/third_party/swiftshader +if [ -e "src/third_party/swiftshader" ]; then + rm -rfv "src/third_party/swiftshader" +fi +ln -v -s "$PWD/chromium-SwiftShader" "src/third_party/swiftshader" + +## setup chromium-android_ndk into src/third_party/android_ndk +if [ -e "src/third_party/android_ndk" ]; then + rm -rfv "src/third_party/android_ndk" +fi +ln -v -s "$PWD/chromium-android_ndk" "src/third_party/android_ndk" + +## setup chromium-android_ndk into src/third_party/android_tools/ndk +mkdir -p "src/third_party/android_tools" +if [ -e "src/third_party/android_tools/ndk" ]; then + rm -rfv "src/third_party/android_tools/ndk" +fi +ln -v -s "$PWD/chromium-android_ndk" "src/third_party/android_tools/ndk" + +## setup DepotTools into src/third_party/depot_tools +if [ -e "src/third_party/depot_tools" ]; then + rm -rfv "src/third_party/depot_tools" +fi +ln -v -s "$PWD/DepotTools" "src/third_party/depot_tools" + +## setup chromium-flatbuffers into src/third_party/flatbuffers/src +mkdir -p "src/third_party/flatbuffers" +if [ -e "src/third_party/flatbuffers/src" ]; then + rm -rfv "src/third_party/flatbuffers/src" +fi +ln -v -s "$PWD/chromium-flatbuffers" "src/third_party/flatbuffers/src" + +## setup chromium-pywebsocket into src/third_party/pywebsocket/src +mkdir -p "src/third_party/pywebsocket" +if [ -e "src/third_party/pywebsocket/src" ]; then + rm -rfv "src/third_party/pywebsocket/src" +fi +ln -v -s "$PWD/chromium-pywebsocket" "src/third_party/pywebsocket/src" + +## setup chromium-robolectric into src/third_party/robolectric/robolectric +mkdir -p "src/third_party/robolectric" +if [ -e "src/third_party/robolectric/robolectric" ]; then + rm -rfv "src/third_party/robolectric/robolectric" +fi +ln -v -s "$PWD/chromium-robolectric" "src/third_party/robolectric/robolectric" + +## setup chromium-spirv-tools into src/third_party/spirv-tools-angle/src +mkdir -p "src/third_party/spirv-tools-angle" +if [ -e "src/third_party/spirv-tools-angle/src" ]; then + rm -rfv "src/third_party/spirv-tools-angle/src" +fi +ln -v -s "$PWD/chromium-spirv-tools" "src/third_party/spirv-tools-angle/src" + +## setup chromium-canvas_bench into src/chrome/test/data/perf/canvas_bench +mkdir -p "src/chrome/test/data/perf" +if [ -e "src/chrome/test/data/perf/canvas_bench" ]; then + rm -rfv "src/chrome/test/data/perf/canvas_bench" +fi +ln -v -s "$PWD/chromium-canvas_bench" "src/chrome/test/data/perf/canvas_bench" + +## setup chromium-clang-format into src/buildtools/clang_format/script +mkdir -p "src/buildtools/clang_format" +if [ -e "src/buildtools/clang_format/script" ]; then + rm -rfv "src/buildtools/clang_format/script" +fi +ln -v -s "$PWD/chromium-clang-format" "src/buildtools/clang_format/script" + +## setup chromium-patched-yasm into src/third_party/yasm/source/patched-yasm +mkdir -p "src/third_party/yasm/source" +if [ -e "src/third_party/yasm/source/patched-yasm" ]; then + rm -rfv "src/third_party/yasm/source/patched-yasm" +fi +ln -v -s "$PWD/chromium-patched-yasm" "src/third_party/yasm/source/patched-yasm" + +## setup chromium-android_tools into src/third_party/android_tools +if [ -e "src/third_party/android_tools" ]; then + rm -rfv "src/third_party/android_tools" +fi +ln -v -s "$PWD/chromium-android_tools" "src/third_party/android_tools" + +## setup chromium-glslang-angle into src/third_party/glslang-angle/src +mkdir -p "src/third_party/glslang-angle" +if [ -e "src/third_party/glslang-angle/src" ]; then + rm -rfv "src/third_party/glslang-angle/src" +fi +ln -v -s "$PWD/chromium-glslang-angle" "src/third_party/glslang-angle/src" + +## setup chromium-libjpeg_turbo into src/third_party/libjpeg_turbo +if [ -e "src/third_party/libjpeg_turbo" ]; then + rm -rfv "src/third_party/libjpeg_turbo" +fi +ln -v -s "$PWD/chromium-libjpeg_turbo" "src/third_party/libjpeg_turbo" + +## setup chromium-spirv-headers into src/third_party/spirv-headers/src +mkdir -p "src/third_party/spirv-headers" +if [ -e "src/third_party/spirv-headers/src" ]; then + rm -rfv "src/third_party/spirv-headers/src" +fi +ln -v -s "$PWD/chromium-spirv-headers" "src/third_party/spirv-headers/src" + +## setup chromium-visualmetrics into src/third_party/visualmetrics/src +mkdir -p "src/third_party/visualmetrics" +if [ -e "src/third_party/visualmetrics/src" ]; then + rm -rfv "src/third_party/visualmetrics/src" +fi +ln -v -s "$PWD/chromium-visualmetrics" "src/third_party/visualmetrics/src" + +## setup chromium-libphonenumber into src/third_party/libphonenumber/dist +mkdir -p "src/third_party/libphonenumber" +if [ -e "src/third_party/libphonenumber/dist" ]; then + rm -rfv "src/third_party/libphonenumber/dist" +fi +ln -v -s "$PWD/chromium-libphonenumber" "src/third_party/libphonenumber/dist" + +## setup chromium-netty-tcnative into src/third_party/netty-tcnative/src +mkdir -p "src/third_party/netty-tcnative" +if [ -e "src/third_party/netty-tcnative/src" ]; then + rm -rfv "src/third_party/netty-tcnative/src" +fi +ln -v -s "$PWD/chromium-netty-tcnative" "src/third_party/netty-tcnative/src" + +## setup chromium-ub-uiautomator into src/third_party/ub-uiautomator/lib +mkdir -p "src/third_party/ub-uiautomator" +if [ -e "src/third_party/ub-uiautomator/lib" ]; then + rm -rfv "src/third_party/ub-uiautomator/lib" +fi +ln -v -s "$PWD/chromium-ub-uiautomator" "src/third_party/ub-uiautomator/lib" + +## setup chromium-compact_enc_det into src/third_party/ced/src +mkdir -p "src/third_party/ced" +if [ -e "src/third_party/ced/src" ]; then + rm -rfv "src/third_party/ced/src" +fi +ln -v -s "$PWD/chromium-compact_enc_det" "src/third_party/ced/src" + +## setup chromium-gvr-android-sdk into src/third_party/gvr-android-sdk/src +mkdir -p "src/third_party/gvr-android-sdk" +if [ -e "src/third_party/gvr-android-sdk/src" ]; then + rm -rfv "src/third_party/gvr-android-sdk/src" +fi +ln -v -s "$PWD/chromium-gvr-android-sdk" "src/third_party/gvr-android-sdk/src" + +## setup chromium-libaddressinput into src/third_party/libaddressinput/src +mkdir -p "src/third_party/libaddressinput" +if [ -e "src/third_party/libaddressinput/src" ]; then + rm -rfv "src/third_party/libaddressinput/src" +fi +ln -v -s "$PWD/chromium-libaddressinput" "src/third_party/libaddressinput/src" + +## setup chromium-liblouis-github into src/third_party/liblouis/src +mkdir -p "src/third_party/liblouis" +if [ -e "src/third_party/liblouis/src" ]; then + rm -rfv "src/third_party/liblouis/src" +fi +ln -v -s "$PWD/chromium-liblouis-github" "src/third_party/liblouis/src" + +## setup chromium-android_protobuf into src/third_party/android_protobuf/src +mkdir -p "src/third_party/android_protobuf" +if [ -e "src/third_party/android_protobuf/src" ]; then + rm -rfv "src/third_party/android_protobuf/src" +fi +ln -v -s "$PWD/chromium-android_protobuf" "src/third_party/android_protobuf/src" + +## setup chromium-wayland-protocols into src/third_party/wayland-protocols/src +mkdir -p "src/third_party/wayland-protocols" +if [ -e "src/third_party/wayland-protocols/src" ]; then + rm -rfv "src/third_party/wayland-protocols/src" +fi +ln -v -s "$PWD/chromium-wayland-protocols" "src/third_party/wayland-protocols/src" + +## setup chromium-custom-tabs-client into src/third_party/custom_tabs_client/src +mkdir -p "src/third_party/custom_tabs_client" +if [ -e "src/third_party/custom_tabs_client/src" ]; then + rm -rfv "src/third_party/custom_tabs_client/src" +fi +ln -v -s "$PWD/chromium-custom-tabs-client" "src/third_party/custom_tabs_client/src" + +## setup chromium-libprotobuf-mutator into src/third_party/libprotobuf-mutator/src +mkdir -p "src/third_party/libprotobuf-mutator" +if [ -e "src/third_party/libprotobuf-mutator/src" ]; then + rm -rfv "src/third_party/libprotobuf-mutator/src" +fi +ln -v -s "$PWD/chromium-libprotobuf-mutator" "src/third_party/libprotobuf-mutator/src" + +## setup chromium-devtools-node-modules into src/third_party/devtools-node-modules +if [ -e "src/third_party/devtools-node-modules" ]; then + rm -rfv "src/third_party/devtools-node-modules" +fi +ln -v -s "$PWD/chromium-devtools-node-modules" "src/third_party/devtools-node-modules" + +## setup chromium-hunspell_dictionaries into src/third_party/hunspell_dictionaries +if [ -e "src/third_party/hunspell_dictionaries" ]; then + rm -rfv "src/third_party/hunspell_dictionaries" +fi +ln -v -s "$PWD/chromium-hunspell_dictionaries" "src/third_party/hunspell_dictionaries" + +## setup chromium-linux-syscall-support into src/third_party/lss +if [ -e "src/third_party/lss" ]; then + rm -rfv "src/third_party/lss" +fi +ln -v -s "$PWD/chromium-linux-syscall-support" "src/third_party/lss" + +## setup chromium-apache-portable-runtime into src/third_party/apache-portable-runtime/src +mkdir -p "src/third_party/apache-portable-runtime" +if [ -e "src/third_party/apache-portable-runtime/src" ]; then + rm -rfv "src/third_party/apache-portable-runtime/src" +fi +ln -v -s "$PWD/chromium-apache-portable-runtime" "src/third_party/apache-portable-runtime/src" + +## setup chromium-vulkan-validation-layers into src/third_party/vulkan-validation-layers/src +mkdir -p "src/third_party/vulkan-validation-layers" +if [ -e "src/third_party/vulkan-validation-layers/src" ]; then + rm -rfv "src/third_party/vulkan-validation-layers/src" +fi +ln -v -s "$PWD/chromium-vulkan-validation-layers" "src/third_party/vulkan-validation-layers/src" echo 'All srclibs ready for gclient sync' diff --git a/fdroid/gclient_android.default b/fdroid/gclient_android.default index e6c0bd90..ab838cd1 100644 --- a/fdroid/gclient_android.default +++ b/fdroid/gclient_android.default @@ -5,7 +5,9 @@ solutions = [ "managed" : True, "custom_deps" : { }, - "custom_vars": {}, + "custom_vars": { + 'checkout_nacl': False + }, }, ] cache_dir = None diff --git a/fdroid/gclient_entries b/fdroid/gclient_entries index b026ee1b..e38e9bb1 100644 --- a/fdroid/gclient_entries +++ b/fdroid/gclient_entries @@ -1,30 +1,29 @@ entries = { 'src': 'https://chromium.googlesource.com/chromium/src.git', - 'src/buildtools': 'https://chromium.googlesource.com/chromium/buildtools.git@437a616be5b2056336ed3ca5c33c41f7788ede09', + 'src/buildtools': 'https://chromium.googlesource.com/chromium/buildtools.git@f115f4786771afdfacb18a2299541b23e21f4792', 'src/chrome/test/data/perf/canvas_bench': 'https://chromium.googlesource.com/chromium/canvas_bench.git@a7b40ea5ae0239517d78845a5fc9b12976bfc732', 'src/chrome/test/data/perf/frame_rate/content': 'https://chromium.googlesource.com/chromium/frame_rate/content.git@c10272c88463efeef6bb19c9ec07c42bc8fe22b9', 'src/chrome/test/data/vr/webvr_info': 'https://chromium.googlesource.com/external/github.com/toji/webvr.info.git@c58ae99b9ff9e2aa4c524633519570bf33536248', 'src/media/cdm/api': 'https://chromium.googlesource.com/chromium/cdm.git@ca7130aa8fe6dd6c0664b52768d1957af31ae91b', - 'src/native_client': 'https://chromium.googlesource.com/native_client/src/native_client.git@7f07816e463da403255f0ab4f6d88004450dd09d', 'src/third_party/SPIRV-Tools/src': 'https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git@9166854ac93ef81b026e943ccd230fed6c8b8d3c', 'src/third_party/android_ndk': 'https://chromium.googlesource.com/android_ndk.git@e951c37287c7d8cd915bf8d4149fd4a06d808b55', 'src/third_party/android_protobuf/src': 'https://chromium.googlesource.com/external/android_protobuf.git@7fca48d8ce97f7ba3ab8eea5c472f1ad3711762f', 'src/third_party/android_tools': 'https://chromium.googlesource.com/android_tools.git@c9f9bbf0a6c862fbef6115e80e8617093cd58e6b', - 'src/third_party/angle': 'https://chromium.googlesource.com/angle/angle.git@379681336ba11f33b95b337b7fa324e6336a780e', + 'src/third_party/angle': 'https://chromium.googlesource.com/angle/angle.git@aba14ff52bea59b0111ba536843209134479a37c', 'src/third_party/apache-portable-runtime/src': 'https://chromium.googlesource.com/external/apache-portable-runtime.git@c3f11fcd86b42922834cae91103cf068246c6bb6', 'src/third_party/auto/src': 'https://chromium.googlesource.com/external/github.com/google/auto.git@8a81a858ae7b78a1aef71ac3905fade0bbd64e82', 'src/third_party/bidichecker': 'https://chromium.googlesource.com/external/bidichecker/lib.git@97f2aa645b74c28c57eca56992235c79850fa9e0', 'src/third_party/boringssl/src': 'https://boringssl.googlesource.com/boringssl.git@94cd196a80252c98e329e979870f2a462cc4f402', 'src/third_party/breakpad/breakpad': 'https://chromium.googlesource.com/breakpad/breakpad.git@4a02ec03038d9d6f870f42d5070591512f488db0', - 'src/third_party/catapult': 'https://chromium.googlesource.com/catapult.git@20b4aa3deae83d8f689859aebd27601056403c82', + 'src/third_party/catapult': 'https://chromium.googlesource.com/catapult.git@82f653f9a44e39589c490ee2122663cbd95ab21e', 'src/third_party/ced/src': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@94c367a1fe3a13207f4b22604fcfd1d9f9ddf6d9', - 'src/third_party/chromite': 'https://chromium.googlesource.com/chromiumos/chromite.git@10ace85c7a3e6c42cbc0805da3379fe70be70d68', + 'src/third_party/chromite': 'https://chromium.googlesource.com/chromiumos/chromite.git@5b16d08cfaf8b1fc689a9c68258c258f4ad0fff8', 'src/third_party/cld_3/src': 'https://chromium.googlesource.com/external/github.com/google/cld_3.git@ae02d6b8a2af41e87c956c7c7d3f651a8b7b9e79', 'src/third_party/colorama/src': 'https://chromium.googlesource.com/external/colorama.git@799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8', 'src/third_party/crc32c/src': 'https://chromium.googlesource.com/external/github.com/google/crc32c.git@0f771ed5ef83556451e1736f22b1a11054dc81c3', - 'src/third_party/cros_system_api': 'https://chromium.googlesource.com/chromiumos/platform/system_api.git@5c8aa4d8a30e89added6423a242360225661c554', + 'src/third_party/cros_system_api': 'https://chromium.googlesource.com/chromiumos/platform/system_api.git@55af1ecf95886bd60661dd7c62a9e32ec364afc1', 'src/third_party/custom_tabs_client/src': 'https://chromium.googlesource.com/custom-tabs-client.git@a0b6c6f7db4127c191ebb9ef008609224658edb2', - 'src/third_party/depot_tools': 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@fd4ad2416554c43f6ecd2c9c62ab5914f521c9ad', + 'src/third_party/depot_tools': 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@23c165f3c831e6b045b1ce914170f42fed86d0dc', 'src/third_party/devtools-node-modules': 'https://chromium.googlesource.com/external/github.com/ChromeDevTools/devtools-node-modules@5f7cd2497d7a643125c3b6eb910d99ba28be6899', 'src/third_party/dom_distiller_js/dist': 'https://chromium.googlesource.com/chromium/dom-distiller/dist.git@60b46718e28f553ab57e3d2bbda5b3b41456f417', 'src/third_party/elfutils/src': 'https://chromium.googlesource.com/external/elfutils.git@249673729a7e5dbd5de4f3760bdcaa3d23d154d7', @@ -56,10 +55,10 @@ entries = { 'src/third_party/libphonenumber/dist': 'https://chromium.googlesource.com/external/libphonenumber.git@a4da30df63a097d67e3c429ead6790ad91d36cf4', 'src/third_party/libprotobuf-mutator/src': 'https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git@3fc43a01d721ef1bacfefed170bc22abf1b8b051', 'src/third_party/libsrtp': 'https://chromium.googlesource.com/chromium/deps/libsrtp.git@1d45b8e599dc2db6ea3ae22dbc94a8c504652423', - 'src/third_party/libsync/src': 'https://chromium.googlesource.com/aosp/platform/system/core/libsync.git@aa6cda6f638bd57d3a024f0d201f723a5c3bb875', - 'src/third_party/libvpx/source/libvpx': 'https://chromium.googlesource.com/webm/libvpx.git@373e08f921e5bfd5a96963fabbbbe16ec793d44e', + 'src/third_party/libsync/src': 'https://chromium.googlesource.com/aosp/platform/system/core/libsync.git@f4f4387b6bf2387efbcfd1453af4892e8982faf6', + 'src/third_party/libvpx/source/libvpx': 'https://chromium.googlesource.com/webm/libvpx.git@742ae4b24d28342a1642c9749826ee8428b20d6e', 'src/third_party/libwebm/source': 'https://chromium.googlesource.com/webm/libwebm.git@b03c65468b06d097f27235d93d76bfc45f490ede', - 'src/third_party/libyuv': 'https://chromium.googlesource.com/libyuv/libyuv.git@09db0c4ce2008008f73b247f1a5b64cfbb29b72e', + 'src/third_party/libyuv': 'https://chromium.googlesource.com/libyuv/libyuv.git@92e22cf5b66173d5d5056751ca62bc2254e4ff86', 'src/third_party/lss': 'https://chromium.googlesource.com/linux-syscall-support.git@e6527b0cd469e3ff5764785dadcb39bf7d787154', 'src/third_party/mesa/src': 'https://chromium.googlesource.com/chromium/deps/mesa.git@ef811c6bd4de74e13e7035ca882cc77f85793fef', 'src/third_party/minigbm/src': 'https://chromium.googlesource.com/chromiumos/platform/minigbm.git@27a7e6a24709564e18c3382d0aeda0b40c7ae03b', @@ -69,7 +68,7 @@ entries = { 'src/third_party/netty4/src': 'https://chromium.googlesource.com/external/netty4.git@cc4420b13bb4eeea5b1cf4f93b2755644cd3b120', 'src/third_party/openh264/src': 'https://chromium.googlesource.com/external/github.com/cisco/openh264@2e96d62426547ac4fb5cbcd122e5f6eb68d66ee6', 'src/third_party/openmax_dl': 'https://webrtc.googlesource.com/deps/third_party/openmax.git@b611996df3b8f6b151339d22c12c21f167009cb6', - 'src/third_party/pdfium': 'https://pdfium.googlesource.com/pdfium.git@003e96c7c3e15afd2969d33bc91ca459bb73a3b5', + 'src/third_party/pdfium': 'https://pdfium.googlesource.com/pdfium.git@6e8a3e62e1718c3739f44e94c128123276d85682', 'src/third_party/perfetto': 'https://android.googlesource.com/platform/external/perfetto.git@135841c8077f13f14c6b80e32d391da84d2ee131', 'src/third_party/pyelftools': 'https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git@19b3e610c86fcadb837d252c794cb5e8008826ae', 'src/third_party/pyftpdlib/src': 'https://chromium.googlesource.com/external/pyftpdlib.git@2be6d65e31c7ee6320d059f581f05ae8d89d7e45', @@ -79,29 +78,29 @@ entries = { 'src/third_party/robolectric/robolectric': 'https://chromium.googlesource.com/external/robolectric.git@7e067f1112e1502caa742f7be72d37b5678d3403', 'src/third_party/sfntly/src': 'https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git@16f3404e41edc9708a51fbce481f22e46b809686', 'src/third_party/shaderc/src': 'https://chromium.googlesource.com/external/github.com/google/shaderc.git@cd8793c34907073025af2622c28bcee64e9879a4', - 'src/third_party/skia': 'https://skia.googlesource.com/skia.git@3da15bb1c813d7a3c563c372fbfb3931e5b6c27c', + 'src/third_party/skia': 'https://skia.googlesource.com/skia.git@fbe6620284a5df423f00ef5b935a24f0682cba29', 'src/third_party/smhasher/src': 'https://chromium.googlesource.com/external/smhasher.git@e87738e57558e0ec472b2fc3a643b838e5b6e88f', 'src/third_party/snappy/src': 'https://chromium.googlesource.com/external/github.com/google/snappy.git@b02bfa754ebf27921d8da3bd2517eab445b84ff9', 'src/third_party/swiftshader': 'https://swiftshader.googlesource.com/SwiftShader.git@b1d452eaeeb8272e37b87446511f2e0e95d27e6f', 'src/third_party/ub-uiautomator/lib': 'https://chromium.googlesource.com/chromium/third_party/ub-uiautomator.git@00270549ce3161ae72ceb24712618ea28b4f9434', 'src/third_party/usrsctp/usrsctplib': 'https://chromium.googlesource.com/external/github.com/sctplab/usrsctp@0e076261b832121cf120ddc04aaff87ac3a34d30', 'src/third_party/visualmetrics/src': 'https://chromium.googlesource.com/external/github.com/WPO-Foundation/visualmetrics.git@1edde9d2fe203229c895b648fdec355917200ad6', - 'src/third_party/wayland-protocols/src': 'https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git@26c99346ab5f2273fe5581bc4f6397bbb834f747', + 'src/third_party/wayland-protocols/src': 'https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git@4f789286e4ab7f6fecc2ccb895d79362a9b2382a', 'src/third_party/wayland/src': 'https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git@1361da9cd5a719b32d978485a29920429a31ed25', 'src/third_party/wds/src': 'https://chromium.googlesource.com/external/github.com/01org/wds@ac3d8210d95f3000bf5c8e16a79dbbbf22d554a5', 'src/third_party/webdriver/pylib': 'https://chromium.googlesource.com/external/selenium/py.git@5fd78261a75fe08d27ca4835fb6c5ce4b42275bd', 'src/third_party/webgl/src': 'https://chromium.googlesource.com/external/khronosgroup/webgl.git@d458ada06171a85af00367251a4ed55db7fe2018', - 'src/third_party/webrtc': 'https://webrtc.googlesource.com/src.git@5864639a46501501c9f7fe8a22ae485886a9965f', + 'src/third_party/webrtc': 'https://webrtc.googlesource.com/src.git@22da89f502ab7ed618b7099f5010da021333bf71', 'src/third_party/xdg-utils': 'https://chromium.googlesource.com/chromium/deps/xdg-utils.git@d80274d5869b17b8c9067a1022e4416ee7ed5e0d', 'src/third_party/yasm/source/patched-yasm': 'https://chromium.googlesource.com/chromium/deps/yasm/patched-yasm.git@b98114e18d8b9b84586b10d24353ab8616d4c5fc', 'src/tools/gyp': 'https://chromium.googlesource.com/external/gyp.git@d61a9397e668fa9843c4aa7da9e79460fe590bfb', 'src/tools/page_cycler/acid3': 'https://chromium.googlesource.com/chromium/deps/acid3.git@6be0a66a1ebd7ebc5abc1b2f405a945f6d871521', 'src/tools/swarming_client': 'https://chromium.googlesource.com/infra/luci/client-py.git@88229872dd17e71658fe96763feaa77915d8cbd6', - 'src/v8': 'https://chromium.googlesource.com/v8/v8.git@8d2dfd44e66ec72702b1ebdaa667623387f4dcd1', + 'src/v8': 'https://chromium.googlesource.com/v8/v8.git@b4e468e1bc7c9aca1c0e5f33769d23634e30796e', 'src/buildtools/clang_format/script': 'https://chromium.googlesource.com/chromium/llvm-project/cfe/tools/clang-format.git@0653eee0c81ea04715c635dd0885e8096ff6ba6d', - 'src/buildtools/third_party/libc++/trunk': 'https://chromium.googlesource.com/chromium/llvm-project/libcxx.git@f56f1bba1ade4a408d403ff050d50e837bae47df', - 'src/buildtools/third_party/libc++abi/trunk': 'https://chromium.googlesource.com/chromium/llvm-project/libcxxabi.git@05ba3281482304ae8de31123a594972a495da06d', - 'src/buildtools/third_party/libunwind/trunk': 'https://chromium.googlesource.com/external/llvm.org/libunwind.git@fc0a910c25d5415dd72ba9451b7cba380e3cc1e7', + 'src/buildtools/third_party/libc++/trunk': 'https://chromium.googlesource.com/chromium/llvm-project/libcxx.git@27c341db41bc9df5c6f19cde65f002d6f1c2eb3c', + 'src/buildtools/third_party/libc++abi/trunk': 'https://chromium.googlesource.com/chromium/llvm-project/libcxxabi.git@e1601db2504857d44db88a5d4e2ca50b32bbb7d9', + 'src/buildtools/third_party/libunwind/trunk': 'https://chromium.googlesource.com/external/llvm.org/libunwind.git@86ab23972978242b6f9e27cebc239f3e8428b1af', 'src/third_party/android_tools/ndk': 'https://chromium.googlesource.com/android_ndk.git@e951c37287c7d8cd915bf8d4149fd4a06d808b55', 'src/third_party/deqp/src': 'https://android.googlesource.com/platform/external/deqp@455d82c60b096e7bd83b6a2f5ed70c61e4bfa759', 'src/third_party/glslang-angle/src': 'https://android.googlesource.com/platform/external/shaderc/glslang@2edde6665d9a56ead5ea0e55b4e64d9a803e6164', diff --git a/fdroid/install-deps.sh b/fdroid/install-deps.sh index a6312bc1..1ba7a621 100755 --- a/fdroid/install-deps.sh +++ b/fdroid/install-deps.sh @@ -1,5 +1,20 @@ #!/bin/bash +if [ ! $# -eq 1 ]; then + echo "Usage: install-deps.sh release" 1>&2 + exit 1 +fi + +RELEASE="$1" + +## sudo starts in fdroiddata/ echo "SUDO from $PWD" -echo "INSTALL DEPS" +set -e + +## the main srclib must already be present +cd build/srclib/chromium + +git checkout "$RELEASE" + +exec build/install-build-deps-android.sh diff --git a/fdroid/sync.sh b/fdroid/sync.sh index 1868a710..69fdee87 100755 --- a/fdroid/sync.sh +++ b/fdroid/sync.sh @@ -2,28 +2,35 @@ set -e +## sync starts in fdroiddata/build/$PKG echo "SYNC from $PWD" -mkdir -p srcvol +. common -if [ -e srcvol/src ]; then - unlink srcvol/src -fi -ln -s build/srclib/chromium srcvol/src +## install gclient configuration files +cp gclient_android.default ../../srclib/.gclient +cp gclient_entries ../../srclib/.gclient_entries -./gclient-prepare.sh +## create all necessary srclib symlinks so that gclient does not fetch them again +cd ../../srclib +../$PKG/fdroid/gclient-prepare.sh -## create output directory - preserve if exists but make sure it's a symlink -mkdir -p srcvol/out -if [ -e srcvol/src/out ]; then - unlink srcvol/src/out -fi -ln -s "$PWD/srcvol/out" srcvol/src/out - -. depot-tools.env - -cp gclient_android.default srcvol/.gclient -cp gclient_entries srcvol/.gclient_entries +## gclient must run in the chromium directory and it cannot be a symlink +cd src +set +e #gclient sync --with_branch_heads --delete_unversioned_trees -exec gclient sync +echo y | gclient sync --reset +RV=$? + +## revert the license workaround +git checkout DEPS +cd .. + +if [ $RV -eq 0 ]; then + ## success, copy the new gclient_entries + cp .gclient_entries ../$PKG/fdroid/gclient_entries + exit 0 +fi + +exit $RV