diff --git a/CHANGELOG.md b/CHANGELOG.md index 218f9c7..28400a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,4 +22,7 @@ # 76.0.3809.87-1 * Add WebView builds * Since `aapt` no longer works, bundled `aapt2` will be used until a rebuild of SDK 29 exists -* Minor bug fixes \ No newline at end of file +* Minor bug fixes + +# 76.0.3809.100-1 +* Change default setting of contextual search to false \ No newline at end of file diff --git a/android_flags.gn b/android_flags.gn index 21b2b6d..0a33a05 100644 --- a/android_flags.gn +++ b/android_flags.gn @@ -14,6 +14,7 @@ enable_resource_whitelist_generation=false ffmpeg_branding="Chrome" is_clang=true is_component_build=false +rtc_build_examples=false target_os="android" target_cpu="arm64" use_jumbo_build=true diff --git a/android_flags.release.gn b/android_flags.release.gn new file mode 100644 index 0000000..cb97f48 --- /dev/null +++ b/android_flags.release.gn @@ -0,0 +1,7 @@ +blink_symbol_level=0 +enable_ac3_eac3_audio_demuxing=true +enable_iterator_debugging=false +fatal_linker_warnings=false +is_debug=false +is_official_build=true +symbol_level=0 \ No newline at end of file diff --git a/build.sh b/build.sh index 32f8e78..525ea59 100755 --- a/build.sh +++ b/build.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash set -eux -o pipefail -chromium_version=76.0.3809.87 +chromium_version=76.0.3809.100 target=monochrome_public_apk -#target=system_webview_apk +webview_target=system_webview_apk # Required tools: python2, python3, ninja, git, clang, lld, llvm, curl # Assuming default python to be python2. This is true on most Linux distributions. @@ -20,7 +20,7 @@ mkdir -p depot_tools pushd depot_tools git init git remote add origin https://chromium.googlesource.com/chromium/tools/depot_tools.git -git fetch --depth 1 --no-tags origin ${depot_tools_commit} +git fetch --depth 1 --no-tags origin "${depot_tools_commit}" git reset --hard FETCH_HEAD popd export PATH="$(pwd -P)/depot_tools:$PATH" @@ -37,7 +37,7 @@ mkdir src/third_party/feed/src pushd src/third_party/feed/src git init git remote add origin https://chromium.googlesource.com/feed -git fetch --depth 1 --no-tags origin ${feed_commit} +git fetch --depth 1 --no-tags origin "${feed_commit}" git reset --hard FETCH_HEAD popd @@ -46,7 +46,7 @@ mkdir src/third_party/webrtc pushd src/third_party/webrtc git init git remote add origin https://webrtc.googlesource.com/src.git -git fetch --depth 1 --no-tags origin ${webrtc_commit} +git fetch --depth 1 --no-tags origin "${webrtc_commit}" git reset --hard FETCH_HEAD popd @@ -55,7 +55,7 @@ mkdir src/third_party/libsync/src pushd src/third_party/libsync/src git init git remote add origin https://chromium.googlesource.com/aosp/platform/system/core/libsync.git -git fetch --depth 1 --no-tags origin ${libsync_commit} +git fetch --depth 1 --no-tags origin "${libsync_commit}" git reset --hard FETCH_HEAD popd @@ -186,7 +186,7 @@ popd ## Configure output folder cd src mkdir -p out/Default -cat ../ungoogled-chromium/flags.gn ../android_flags.gn > out/Default/args.gn +cat ../ungoogled-chromium/flags.gn ../android_flags.gn ../android_flags.release.gn > out/Default/args.gn tools/gn/out/gn gen out/Default --fail-on-unused-args @@ -198,3 +198,4 @@ export CXX=${CXX:=clang++} ## Build ninja -C out/Default ${target} +ninja -C out/Default ${webview_target} diff --git a/misc/android_studio_setup.sh b/misc/android_studio_setup.sh index 7840c77..dfa7326 100755 --- a/misc/android_studio_setup.sh +++ b/misc/android_studio_setup.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -eux -o pipefail -chromium_version=76.0.3809.87 +chromium_version=76.0.3809.100 target=monochrome_public_apk # Create symbol links to gn, depot-tools diff --git a/patches/series b/patches/series index c8d98a4..fa1b358 100644 --- a/patches/series +++ b/patches/series @@ -14,4 +14,5 @@ ungoogled-chromium-android/remove-gms-vision-clearcut-phenotype.patch ungoogled-chromium-android/remove-gms-flags-places-stats.patch ungoogled-chromium-android/remove-gms-base-tasks.patch ungoogled-chromium-android/remove-play-core.patch -ungoogled-chromium-android/uncheck-fre-send-report.patch \ No newline at end of file +ungoogled-chromium-android/uncheck-fre-send-report.patch +ungoogled-chromium-android/disable-context-search-by-default.patch \ No newline at end of file diff --git a/patches/ungoogled-chromium-android/disable-context-search-by-default.patch b/patches/ungoogled-chromium-android/disable-context-search-by-default.patch new file mode 100644 index 0000000..035d3f3 --- /dev/null +++ b/patches/ungoogled-chromium-android/disable-context-search-by-default.patch @@ -0,0 +1,19 @@ +description: disable contextual search in preference by default +author: Wengling Chen + +--- + .../src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java +@@ -419,7 +419,7 @@ public class PrefServiceBridge { + * @return Whether the Contextual Search feature was disabled by the user explicitly. + */ + public boolean isContextualSearchDisabled() { +- return getContextualSearchPreference().equals(CONTEXTUAL_SEARCH_DISABLED); ++ return !getContextualSearchPreference().equals(CONTEXTUAL_SEARCH_ENABLED); + } + + /**