Browse Source

Update to 75.0.3770.80; build binaries; additional domain substitution; minor fixes

tags/75.0.3770.80-1^0 75.0.3770.80-1
wchen342 2 years ago
parent
commit
dce9d11b6e
Signed by: wchen342 GPG Key ID: 720B70365E800508
11 changed files with 14483 additions and 48 deletions
  1. +5
    -5
      README.md
  2. +4
    -1
      android_flags.gn
  3. +76
    -0
      binary_dependencies
  4. +79
    -23
      build.sh
  5. +14214
    -0
      domain_sub_2.list
  6. BIN
      extras/gcm-client.tar.gz
  7. +40
    -0
      misc/misc.sh
  8. +16
    -0
      patches/aapt2-param.patch
  9. +17
    -19
      patches/android-prune-domain-fix.patch
  10. +14
    -0
      patches/eu-strip-build-script.patch
  11. +18
    -0
      pruning_2.list

+ 5
- 5
README.md View File

@ -28,15 +28,15 @@ The current build has been tested on:
## Building Instructions
*This build is built from Sylvain Beucler's [libre Android rebuilds](http://android-rebuilds.beuc.net/) instead of SDK/NDK binaries from Google.*
Clone this repository and run `build.sh`. Build time dependencies can be rougnly referred from [AUR](https://aur.archlinux.org/packages/ungoogled-chromium-archlinux/).
Clone this repository and run `build.sh`. Build time dependencies can be roughly referred from [AUR](https://aur.archlinux.org/packages/ungoogled-chromium/).
For a more customized building process, see building instructions from [the original repo](https://github.com/Eloston/ungoogled-chromium/blob/master/docs/building.md).
## TODO List
- [ ] Prune the binaries
- [ ] Remove dependencies on SDK tools and extras
- [ ] Remove Play Services dependencies
- [ ] Domain substitution in java files
- [x] Remove dependencies on SDK tools and extras
- [x] Domain substitution in java files
- [ ] Prune binaries
- [ ] Remove Play Services
- [ ] Java patches (mostly UI-related)
## Credits


+ 4
- 1
android_flags.gn View File

@ -1,10 +1,13 @@
android_channel="stable"
android32_ndk_api_level=21
android64_ndk_api_level=21
clang_base_path="/usr"
android_ndk_root = "//../android-ndk/android-ndk-r18b"
android_ndk_version = "r18b"
android_ndk_major_version = 18
android_sdk_build_tools_version="27.0.3"
android_sdk_tools_version_suffix="-26.2.0-dev"
android_sdk_version=28
clang_base_path="/usr"
disable_android_lint=true
enable_gvr_services=false
enable_resource_whitelist_generation=false


+ 76
- 0
binary_dependencies View File

@ -0,0 +1,76 @@
jar/aar:
"src/third_party/android_deps/libs/androidx_test_core": None,
"src/third_party/android_deps/libs/androidx_test_ext_junit": None,
"src/third_party/android_deps/libs/androidx_test_monitor": None,
"src/third_party/android_deps/libs/com_android_support_leanback_v17": None,
"src/third_party/android_deps/libs/com_android_support_preference_leanback_v17": None,
"src/third_party/android_deps/libs/com_android_support_preference_v14": None,
"src/third_party/android_deps/libs/com_android_support_preference_v7": None,
"src/third_party/android_deps/libs/com_google_android_gms_play_services_auth": None,
"src/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone": None,
"src/third_party/android_deps/libs/com_google_android_gms_play_services_fido": None,
"src/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps": None,
"src/third_party/android_deps/libs/com_google_ar_core": None,
"src/third_party/android_deps/libs/com_google_code_findbugs_jsr305": None,
"src/third_party/android_deps/libs/com_google_dagger_dagger_spi": None,
"src/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations": None,
"src/third_party/android_deps/libs/com_google_errorprone_javac_shaded": None,
"src/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format": None,
"src/third_party/android_deps/libs/com_google_guava_guava": None,
"src/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations": None,
"src/third_party/android_deps/libs/javax_annotation_jsr250_api": None,
"src/third_party/android_deps/libs/org_checkerframework_checker_compat_qual": None,
"src/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations": None,
"src/third_party/android_deps/libs/android_arch_lifecycle_runtime": None,7
"src/third_party/android_deps/libs/com_android_support_support_compat": None,27
"src/third_party/android_deps/libs/com_android_support_support_core_ui": None,28
"src/third_party/android_deps/libs/com_android_support_support_core_utils": None,29
"src/third_party/android_deps/libs/com_android_support_support_fragment": None,30
"src/third_party/android_deps/libs/com_android_support_support_media_compat": None,31
"src/third_party/android_deps/libs/com_android_support_support_v4": None,33
"src/third_party/android_deps/libs/com_android_support_animated_vector_drawable": None,13
"src/third_party/android_deps/libs/com_android_support_support_vector_drawable": None,34
"src/third_party/android_deps/libs/com_android_support_appcompat_v7": None,14
"src/third_party/android_deps/libs/com_android_support_recyclerview_v7": None,25
"src/third_party/android_deps/libs/com_google_android_gms_play_services_base": None,39
"src/third_party/android_deps/libs/com_google_android_gms_play_services_basement": None,40
"src/third_party/android_deps/libs/com_android_support_design": None,16
"src/third_party/android_deps/libs/com_android_support_transition": None,35
"src/third_party/android_deps/libs/com_android_support_gridlayout_v7": None,17
"src/third_party/android_deps/libs/com_google_android_gms_play_services_gcm": None,46
"src/third_party/android_deps/libs/com_google_android_gms_play_services_iid": None,47
"src/third_party/android_deps/libs/com_android_support_support_v13": None,32
"src/third_party/android_deps/libs/com_android_support_mediarouter_v7": None,19
"src/third_party/android_deps/libs/com_android_support_palette_v7": None,21
"src/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework": None,42
"src/third_party/android_deps/libs/com_google_android_gms_play_services_cast": None,41
"src/third_party/android_deps/libs/com_android_support_cardview_v7": None,15
"src/third_party/bazel": None,83
"src/third_party/r8": None,98
"src/third_party/guava": None,90
"src/third_party/android_deps/libs/com_squareup_javapoet": None,68
"src/third_party/android_deps/libs/com_android_support_support_annotations": None,26
"src/third_party/android_deps/libs/com_android_support_multidex": None,20
"src/third_party/ow2_asm": None,95
"src/third_party/android_deps/libs/android_arch_core_common": None,5
"src/third_party/android_deps/libs/android_arch_lifecycle_common": None,6
"src/third_party/android_deps/libs/com_google_protobuf_protobuf_lite": None,67
"src/third_party/android_deps/libs/com_google_android_gms_play_services_tasks": None,53
"src/third_party/android_deps/libs/com_google_android_gms_play_services_location": None,49
"src/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport": None,51
"src/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common": None,55
"src/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut": None,43
"src/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype": None,50
"src/third_party/android_deps/libs/com_google_android_gms_play_services_flags": None,45
"src/third_party/android_deps/libs/com_google_android_gms_play_services_vision": None,54
"src/third_party/android_system_sdk": None,80
"src/third_party/android_deps/libs/com_google_android_gms_play_services_stats": None,52
"src/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base": None,38
"src/third_party/android_deps/libs/com_google_dagger_dagger": None,58
"src/third_party/android_deps/libs/javax_inject_javax_inject": None,70
"src/third_party/android_deps/libs/com_google_dagger_dagger_compiler": None,59
"src/third_party/android_deps/libs/com_google_dagger_dagger_producers": None,60
"src/third_party/google_android_play_core": None,88
"src/third_party/android_deps/libs/androidx_annotation_annotation": None,8
"src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_common": None,9
"src/third_party/custom_tabs_client/src": None,gradle-wrapper.jar

+ 79
- 23
build.sh View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -eux -o pipefail
chromium_version=74.0.3729.169
chromium_version=75.0.3770.80
target=monochrome_public_apk
# Required tools: python2, python3, ninja, git, clang, lld, llvm, curl
@ -26,6 +26,7 @@ export PATH="$(pwd -P)/depot_tools:$PATH"
## Sync files
# third_party/android_deps and some other overrides doesn't work
gclient.py sync --nohooks --no-history --shallow --revision=${chromium_version}
@ -65,7 +66,6 @@ git checkout ${gn_commit}
popd
cp -r src/tools/gn.bak/bootstrap src/tools/gn
## Hooks
python src/build/util/lastchange.py -o src/build/util/LASTCHANGE
python src/chrome/android/profiles/update_afdo_profile.py
@ -100,54 +100,110 @@ cp download_file_types.pb.h src/out/Default/gen/chrome/common/safe_browsing
cp download_file_types.pb.h src/chrome/common/safe_browsing/download_file_types.pb.h
## Set compiler flags
export AR=${AR:=llvm-ar}
export NM=${NM:=llvm-nm}
export CC=${CC:=clang}
export CXX=${CXX:=clang++}
## Genarate gn file
pushd src/tools/gn
build/gen.py
ninja -C out gn
popd
## Prepare Android SDK/NDK
# This is Sylvain Beucler's libre Android rebuild
sdk_link="https://android-rebuilds.beuc.net/dl/android-sdk_user.9.0.0_r21_linux-x86.zip"
sdk_tools_link="https://android-rebuilds.beuc.net/dl/sdk-repo-linux-tools-26.1.1.zip"
ndk_link="https://android-rebuilds.beuc.net/dl/android-ndk-r18b-linux-x86_64.tar.bz2"
mkdir android-rebuilds
mkdir android-sdk
mkdir android-ndk
cd android-rebuilds && { curl -O ${sdk_link} ; curl -O ${ndk_link} ; cd -; }
cd android-rebuilds && { curl -O ${sdk_link} ; curl -O ${sdk_tools_link} ; curl -O ${ndk_link} ; cd -; }
unzip -qqo android-rebuilds/android-sdk_user.9.0.0_r21_linux-x86.zip -d android-sdk
unzip -qqo android-rebuilds/sdk-repo-linux-tools-26.1.1.zip -d android-sdk/android-sdk_user.9.0.0_r21_linux-x86
tar xjf android-rebuilds/android-ndk-r18b-linux-x86_64.tar.bz2 -C android-ndk
# remove data_space.h, patch native_window.h
mv android-ndk/android-ndk-r18b/sysroot/usr/include/android/data_space.h android-ndk/android-ndk-r18b/sysroot/usr/include/android/data_space.h.bak
patch -p1 --ignore-whitespace -i patches/ndk-native-window.patch --no-backup-if-mismatch
# Create symbol links to sdk folders
# The rebuild sdk has a different folder structure from the checked out version, so it is easier to create symbol links
# Currently extras and tools are not available from the rebuild
pushd src/third_party/android_tools/sdk
rm -rf add-ons emulator licenses platforms sources tools-lint build-tools ndk-bundle platform-tools
mkdir build-tools
ln -s ../../../../../android-sdk/android-sdk_user.9.0.0_r21_linux-x86/build-tools/android-9 build-tools/27.0.3
# rm -rf src/third_party/android_sdk # The folder is not used
pushd src/third_party/android_build_tools
rm -rf aapt2
ln -s ../../../android-sdk/android-sdk_user.9.0.0_r21_linux-x86/build-tools/android-9 aapt2
popd
DIRECTORY="src/third_party/android_sdk/public"
if [[ -d "$DIRECTORY" ]]; then
rm -rf "$DIRECTORY"
fi
mkdir "${DIRECTORY}" && pushd ${DIRECTORY}
# rm -rf add-ons emulator licenses platforms sources tools-lint build-tools ndk-bundle platform-tools tools
mkdir build-tools && ln -s ../../../../../android-sdk/android-sdk_user.9.0.0_r21_linux-x86/build-tools/android-9 build-tools/27.0.3
mkdir platforms
ln -s ../../../../../android-sdk/android-sdk_user.9.0.0_r21_linux-x86/platforms/android-9 platforms/android-28
ln -s ../../../../android-sdk/android-sdk_user.9.0.0_r21_linux-x86/platform-tools platform-tools
ln -s ../../../../android-sdk/android-sdk_user.9.0.0_r21_linux-x86/tools tools
# build gcm-client
gcm_client_dir="extras/google/gcm/gcm-client/"
mkdir -p ${gcm_client_dir} && tar xzf ../../../../extras/gcm-client.tar.gz -C ${gcm_client_dir} && pushd ${gcm_client_dir}
ant jar
popd
popd
## Compile third-party binaries
# error-prone, from Maven repo
mkdir -p src/third_party/errorprone/lib
pushd src/third_party/errorprone/lib
version=2.3.1
mvn_url="https://repo1.maven.org/maven2/com/google/errorprone/error_prone_ant/${version}"
curl "${mvn_url}/error_prone_ant-${version}.jar" -O
curl "${mvn_url}/error_prone_ant-${version}.jar.asc" -O
echo -e "\033[0;33mThis will add a new key to your GPG keyring! \033[0m"
gpg --recv-keys EE9E7DC9D92FC896
gpg --verify "error_prone_ant-${version}.jar.asc" "error_prone_ant-${version}.jar"
popd
# closure-compiler
DIRECTORY="src/third_party/closure_compiler"
mkdir "${DIRECTORY}"/temp && pushd ${DIRECTORY}/temp
git clone https://github.com/google/closure-compiler && cd closure-compiler
mvn -DskipTests -pl externs/pom.xml,pom-main.xml,pom-main-shaded.xml
cp -a target/closure-compiler-1.0-SNAPSHOT.jar ../../compiler/compiler.jar
cd ../.. && rm -rf temp
popd
# eu-strip can be re-compiled with -Wno-error, but it is probably not a good idea
patch -p1 --ignore-whitespace -i patches/eu-strip-build-script.patch --no-backup-if-mismatch
pushd src/buildtools/third_party/eu-strip
./build.sh
popd
# Some of the support libraries can be grabbed from maven https://android.googlesource.com/platform/prebuilts/maven_repo/android/+/master/com/android/support/
## Second pruning list
pruning_list_2="pruning_2.list"
python3 ungoogled-chromium/utils/prune_binaries.py src ${pruning_list_2} || true
## Second domain substitution list
substitution_list_2="domain_sub_2.list"
# Remove the cache file if exists
cache_file="domsubcache.tar.gz"
if [[ -f ${cache_file} ]] ; then
rm ${cache_file}
fi
python3 ungoogled-chromium/utils/domain_substitution.py apply -r ungoogled-chromium/domain_regex.list -f ${substitution_list_2} -c ${cache_file} src
## Genarate gn file
pushd src/tools/gn
build/gen.py
ninja -C out gn
popd
## Configure output folder
# patch build/config/android/BUILD.gn
# patch build/config/android/BUILD.gn, build/android/gyp/compile_resources.py
patch -p1 --ignore-whitespace -i patches/linker-android-support-remove.patch --no-backup-if-mismatch
patch -p1 --ignore-whitespace -i patches/aapt2-param.patch --no-backup-if-mismatch
cd src
mkdir -p out/Default
cat ../ungoogled-chromium/flags.gn ../android_flags.gn > out/Default/args.gn
tools/gn/out/gn gen out/Default --fail-on-unused-args
## Set compiler flags
export AR=${AR:=llvm-ar}
export NM=${NM:=llvm-nm}
export CC=${CC:=clang}
export CXX=${CXX:=clang++}
## Build
ninja -C out/Default ${target}

+ 14214
- 0
domain_sub_2.list
File diff suppressed because it is too large
View File


BIN
extras/gcm-client.tar.gz View File


+ 40
- 0
misc/misc.sh View File

@ -0,0 +1,40 @@
#!/usr/bin/env bash
# This file is not acturally used
# extension is only for syntax highlighting
# Source files: .py, .pyc, .java, .h, .c, .cc, .cpp, .m, .mm, .asm, .rb, .mojom, .hlsl, .bat, .sh, .am, .map, .go, .aidl, .ac, .m4, .idl, .fidl, .yaml, .nc, .el, .tcl
# Media: .png, .gif, .svg, .jpg, .wav, .webp, .webm, .tiff, .bmp, .ico, .icon, .icns, .mp3, .pdf, .flac, .ogg, .ai, .cur, .xcf
# Web: .xml, .css, .htm, .html, .xhtml, .js, .json, .json5, .jsonp, .headers, .xsl, .ttf, .woff, .woff2
# Config files: .info, .golden, .ninja, .gn, .gni, .config, .cfg, .flags, .proto, .ver, .def, .vim, .gradle, gradlew, .jinja, .jinja2, .typemap, .settings, .pydeps
# Other text: .test, .ps1, .pyl, .csv, .ztf, .filter, .asciipb, .version, .skeletons, .fbs, .lst, .list, .sig, .sigs, .fragment, .grd, .grdp, .tmpl, .template, .md5, .sha1, .plist, .xtb, .in, .manifest, .properties, .chromium, .txt, .yml, .md, .diff, .patch, .cmake, Makefile, Dockerfile, pylintrc, resource_ids, .README, README, COPYING, AUTHORS, DEPS, OWNERS, VERSION, LICENSE, PKG-INFO, WORKSPACE, BUILD, .BUILD, .gitignore, .git-blame-ignore-revs
## Create second pruning list
pruning_list_2="pruning_2.list"
pushd src
find . ! '(' -size 0 -o -size 1 -o -name '*.py' -o -name '*.pyc' -o -name '*.java' -o -name '*.h' -o -name '*.c' -o -name '*.cc' -o -name '*.m' -o -name '*.mm' -o -name '*.cpp' -o -name '*.asm' -o -name '*.rb' -o -name '*.mojom' -o -name '*.hlsl' -o -name '*.bat' -o -name '*.sh' -o -name '*.am' -o -name '*.map' -o -name '*.go' -o -name '*.aidl' -o -name '*.ac' -o -name '*.m4' -o -name '*.idl' -o -name '*.fidl' -o -name '*.yaml' -o -name '*.nc' -o -name '*.el' -o -name '*.tcl' -o -iname '*.png' -o -iname '*.gif' -o -name '*.svg' -o -iname '*.jpg' -o -iname '*.wav' -o -name '*.webp' -o -name '*.webm' -o -name '*.tiff' -o -iname '*.bmp' -o -name '*.ico' -o -name '*.icon' -o -name '*.icns' -o -name '*.mp3' -o -name '*.pdf' -o -name '*.flac' -o -name '*.ogg' -o -name '*.ai' -o -name '*.cur' -o -name '*.xcf' -o -name '*.xml' -o -name '*.css' -o -name '*.htm' -o -name '*.html' -o -name '*.xhtml' -o -name '*.js' -o -name '*.json' -o -name '*.json5' -o -name '*.jsonp' -o -name '*.headers' -o -name '*.xsl' -o -name '*.ttf' -o -name '*.woff' -o -name '*.woff2' -o -name '*.info' -o -name '*.golden' -o -name '*.ninja' -o -name '*.gn' -o -name '*.gni' -o -name '*.config' -o -name '*.cfg' -o -name '*.flags' -o -name '*.proto' -o -name '*.ver' -o -name '*.def' -o -name '*.vim' -o -name '*.gradle' -o -name 'gradlew' -o -name '*.jinja' -o -name '*.jinja2' -o -name '*.typemap' -o -name '*.settings' -o -name '*.pydeps' -o -name '*.test' -o -name '*.ps1' -o -name '*.pyl' -o -name '*.csv' -o -name '*.ztf' -o -name '*.filter' -o -name '*.asciipb' -o -name '*.version' -o -name '*.skeletons' -o -name '*.fbs' -o -name '*.lst' -o -name '*.list' -o -name '*.sig' -o -name '*.sigs' -o -name '*.fragment' -o -name '*.grd' -o -name '*.grdp' -o -name '*.tmpl' -o -name '*.template' -o -name '*.md5' -o -name '*.sha1' -o -name '*.plist' -o -name '*.xtb' -o -name '*.in' -o -name '*.manifest' -o -name '*.properties' -o -name '*.chromium' -o -name '*.txt' -o -name '*.yml' -o -name '*.md' -o -name '*.diff' -o -name '*.patch' -o -name '*.cmake' -o -name 'Makefile' -o -name 'Dockerfile' -o -name 'pylintrc' -o -name 'resource_ids' -o -name '*.README' -o -name 'README' -o -name 'COPYING' -o -name 'AUTHORS' -o -name 'DEPS' -o -name 'OWNERS' -o -name 'VERSION' -o -name 'LICENSE' -o -name 'PKG-INFO' -o -name 'WORKSPACE' -o -name 'BUILD' -o -name '*.BUILD' -o -name '.gitignore' -o -name '.git-blame-ignore-revs' ')' -type f -exec grep -IL . "{}" \; | grep -v -E '/\.git/|/test/data/|/test_data/|/examples/|/web_tests/|/testdata/|/eu-strip/|/android_sdk/|/android_tools/|icudtl\.dat|chromium-debug\.keystore|gradle-wrapper\.jar|afdo\.prof|/ulp_language_code_locator/' > "../${pruning_list_2}"
popd
## Create second domain substitution list
substitution_list_temp="domain_sub.tmp"
substitution_list_2="domain_sub_2.list"
pushd src
if [ -f "../${substitution_list_temp}" ] ; then
rm "../${substitution_list_temp}"
fi
if [ -f "../${substitution_list_2}" ] ; then
rm "../${substitution_list_2}"
fi
touch "../${substitution_list_temp}"
while read line
do
line="$(echo "$line" | cut -d '#' -f1)"
grep -RIl --include="*.gn" --include="*.gni" --include="*.proto" --include="*.def" --include="*.jinja" --include="*.jinja2" --include="*.xml" --include="*.css" --include="*.htm" --include="*.html" --include="*.xhtml" --include="*.js" --include="*.json" --include="*.json5" --include="*.jsonp" --include="*.py" --include="*.java" --include="*.h" --include="*.c" --include="*.cc" --include="*.cpp" --include="*.m" --include="*.mm" --include="*.asm" --include="*.rb" --include="*.mojom" --include="*.hlsl" --include="*.am" --include="*.map" --include="*.go" --include="*.aidl" --include="*.ac" --include="*.m4" --include="*.idl" --include="*.fidl" --include="*.yaml" --include="*.nc" --include="*.el" --include="*.tcl" -P "$line" . | grep -v -E '/\.git/|/android_sdk/|/android_tools/' >> "../${substitution_list_temp}"
done < ../ungoogled-chromium/domain_regex.list
# Not working correctly? awk '{!seen[$0]++};END{for(i in seen) if(seen[i]==1)print i}' "../${substitution_list_temp}" > "../${substitution_list_2}"
sort -u "../${substitution_list_temp}" | uniq > "../${substitution_list_2}"
rm "../${substitution_list_temp}"
popd

+ 16
- 0
patches/aapt2-param.patch View File

@ -0,0 +1,16 @@
Prevent error from paramter mismatch between different versions of aapt2
author: Wengling Chen <[email protected]>
--- a/src/build/android/gyp/compile_resources.py
+++ b/src/build/android/gyp/compile_resources.py
@@ -834,8 +834,8 @@
'--enable-resource-obfuscation',
'-o',
output,
- '--resources-config-path',
- gen_config_path,
+ #'--resources-config-path',
+ #gen_config_path,
unoptimized_apk_path,
]
build_utils.CheckOutput(

+ 17
- 19
patches/android-prune-domain-fix.patch View File

@ -1,9 +1,16 @@
description: remove some prune and fix a domain regex expression
description: remove some prune causing build to fail, avoid matching Android namespace declaration/com.google.common package in .java
author: Wengling Chen <[email protected]>
--- a/ungoogled-chromium/domain_regex.list
+++ b/ungoogled-chromium/domain_regex.list
@@ -16,5 +16,5 @@
@@ -1,5 +1,5 @@
fonts(\\*?)\.googleapis(\\*?)\.com#f0ntz\g<1>.9oo91e8p1\g<2>.qjz9zk
-google([A-Za-z\-]*?\\*?)\.com#9oo91e\g<1>.qjz9zk
+google([A-Za-z\-]*?\\*?)\.com(?!mon)#9oo91e\g<1>.qjz9zk
gstatic([A-Za-z\-]*?\\*?)\.com#95tat1c\g<1>.qjz9zk
chrome([A-Za-z\-]*?\\*?)\.com#ch40me\g<1>.qjz9zk
chromium([A-Za-z\-]*?\\*?)\.org#ch40m1um\g<1>.qjz9zk
@@ -16,5 +16,5 @@ beacons([1-9]?\\*?)\.gvt([1-9]?\\*?)\.com#b3ac0n2\g<1>.9vt\g<2>.qjz9zk
ggpht(\\*?)\.com#99pht\g<1>.qjz9zk
microsoft(\\*?)\.com#m1cr050ft\g<1>.qjz9zk
1e100(\\*?)\.net#l3lOO\g<1>.qjz9zk
@ -13,7 +20,7 @@ author: Wengling Chen <[email protected]>
--- a/ungoogled-chromium/pruning.list
+++ b/ungoogled-chromium/pruning.list
@@ -12,11 +12,9 @@ base/test/data/file_version_info_unittest/FileVersionInfoTest2.dll
@@ -12,7 +12,6 @@
base/test/data/pe_image/pe_image_test_32.dll
base/test/data/pe_image/pe_image_test_64.dll
build/android/CheckInstallApk-debug.apk
@ -21,11 +28,7 @@ author: Wengling Chen <[email protected]>
build/android/tests/symbolize/liba.so
build/android/tests/symbolize/libb.so
build/linux/sysroot_scripts/debian-archive-sid-stable.gpg
-buildtools/third_party/eu-strip/bin/eu-strip
chrome/browser/chromeos/power/ml/smart_dim/example_preprocessor_config.pb
chrome/browser/chromeos/power/ml/smart_dim/lite_example_preprocessor_config.pb
chrome/browser/resources/chromeos/assistant_optin/voice_laptop_1x.webm
@@ -3068,7 +3066,6 @@ third_party/angle/third_party/glmark2/src/data/models/cat.3ds
@@ -3509,7 +3508,6 @@
third_party/angle/third_party/glmark2/src/data/models/cube.3ds
third_party/angle/third_party/glmark2/src/data/models/horse.3ds
third_party/angle/third_party/vulkan-loader/src/loader/loader.aps
@ -33,20 +36,15 @@ author: Wengling Chen <[email protected]>
third_party/blink/manual_tests/WebKitSite.webarchive
third_party/blink/manual_tests/accessibility/resources/AppletTest.class
third_party/blink/manual_tests/plugins/test.swf
@@ -7763,7 +7760,6 @@ third_party/chromite/lib/datafiles/arch.sparc.elf
third_party/chromite/lib/datafiles/arch.sparc64.elf
third_party/chromite/lib/datafiles/arch.x32.elf
third_party/chromite/lib/datafiles/arch.x86_64.elf
-third_party/closure_compiler/compiler/compiler.jar
third_party/crashpad/crashpad/handler/win/z7_test.dll
third_party/crashpad/crashpad/snapshot/elf/elf_image_reader_fuzzer_corpus/crashpad_snapshot_test_both_dt_hash_styles.so
third_party/crashpad/crashpad/snapshot/elf/elf_image_reader_fuzzer_corpus/ret42
@@ -12796,7 +12792,6 @@ third_party/hunspell/fuzz/bdict_corpus/en-US-7-1.bdic
@@ -13238,11 +13236,8 @@
third_party/hunspell/fuzz/bdict_corpus/en-US-8-0.bdic
third_party/hunspell/fuzz/bdict_corpus/f95048cdc0fc231dd712bad106578a9eeecd869b
third_party/hunspell/fuzz/bdict_corpus/fda69541054125551c41ab3e591e0482405ca2dc
-third_party/icu/android/icudtl.dat
-third_party/icu/android_small/icudtl.dat
third_party/icu/cast/icudtl.dat
third_party/icu/common/icudtb.dat
third_party/icu/chromeos/icudtl.dat
-third_party/icu/common/icudtb.dat
third_party/icu/flutter/icudtl.dat
third_party/icu/ios/icudtl.dat
third_party/icu/source/data/in/coll/ucadata-implicithan.icu

+ 14
- 0
patches/eu-strip-build-script.patch View File

@ -0,0 +1,14 @@
Add -Wno-error to CFLAGS
author: Wengling Chen <[email protected]>
--- a/src/buildtools/third_party/eu-strip/build.sh
+++ b/src/buildtools/third_party/eu-strip/build.sh
@@ -12,7 +12,7 @@
mkdir build
cd build
../configure --enable-maintainer-mode
-make -j40
+make -j40 CFLAGS=-Wno-error
gcc -std=gnu99 -Wall -Wshadow -Wunused -Wextra -fgnu89-inline \
-Wformat=2 -Werror -g -O2 -Wl,-rpath-link,libelf:libdw -Wl,--build-id=none -o eu-strip \
src/strip.o libebl/libebl.a libelf/libelf.a lib/libeu.a libdw/libdw.a -ldl -lz

+ 18
- 0
pruning_2.list View File

@ -0,0 +1,18 @@
./third_party/junit/src/lib/hamcrest-core-1.3.jar
./third_party/junit/src/lib/hamcrest-core-1.3-sources.jar
./third_party/junit/src/src/test/resources/junit/tests/runner/testRunFailureResultCanBeSerialised
./third_party/junit/src/src/test/resources/junit/tests/runner/testRunSuccessResultCanBeSerialised
./third_party/android_protobuf/src/benchmarks/google_message2.dat
./third_party/sqlite/patched/test/fuzzdata1.db
./third_party/sqlite/patched/test/sessionfuzz-data1.db
./third_party/sqlite/patched/test/fuzzdata7.db
./third_party/sqlite/patched/test/fuzzdata5.db
./third_party/sqlite/patched/test/fuzzdata2.db
./third_party/sqlite/patched/test/dbfuzz2-seed1.db
./third_party/sqlite/patched/test/fuzzdata8.db
./third_party/sqlite/patched/test/fuzzdata3.db
./third_party/sqlite/patched/test/fuzzdata6.db
./third_party/sqlite/patched/test/fuzzdata4.db
./chrome/browser/resource_coordinator/tab_ranker/example_preprocessor_config.pb
./chrome/common/extensions/docs/static/images/app_codelab/step7-completed
./chrome/common/win/eventlog_messages.mc

Loading…
Cancel
Save