Skip to content
This repository was archived by the owner on Apr 1, 2023. It is now read-only.

Commit d03b833

Browse files
wchen342wchen342
committed
Update to 81.0.4044.138
1 parent b828ac5 commit d03b833

File tree

7 files changed

+60
-125
lines changed

7 files changed

+60
-125
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 81.0.4044.138-1
2+
* Fix a crash with incognito tab
3+
* Minor fix for extension patches. From next release, `chrome`/`arm` target will include a beta version with extension support.
4+
15
# 81.0.4044.129-1
26
* Fix a bug with bookmark add new folder activity.
37
* Add new fix of [#9](https://github.com/wchen342/ungoogled-chromium-android/issues/9).

‎README.md‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,14 @@ I have set up an experimental f-droid repository. Because of the limitation of i
6666
You can use f-Droid client and add [this repository](https://www.droidware.info/fdroid/repo).
6767

6868

69-
## TODO List
70-
- [x] Remove dependencies on SDK tools and extras
71-
- [x] Domain substitution in java files
72-
- [x] Prune binaries (*Note: haven't found a way to build desugar-runtime.jar without bazel. Please let me know if you know how.*)
73-
- [x] Remove Play Services
74-
- [ ] Java patches
75-
7669
## Credits
7770

7871
* [The Chromium Project](//www.chromium.org/)
7972
* [ungoogled-chromium](//github.com/Eloston/ungoogled-chromium)
8073
* [xsmile's fork](//github.com/xsmile/ungoogled-chromium/tree/android)
8174
* [Bromite](//github.com/bromite/bromite)
75+
* [Kiwi Browser](//github.com/kiwibrowser)
76+
* [dvalter's patches](//github.com/dvalter/chromium-android-ext-dev)
8277

8378
## Related Projects
8479

‎build.sh‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ chrome_target=chrome_public_apk
88
mono_target=monochrome_public_apk
99
webview_target=system_webview_apk
1010

11-
chromium_version=81.0.4044.129
11+
chromium_version=81.0.4044.138
1212
ungoogled_chromium_revision=1
1313

1414
# Argument parser from https://stackoverflow.com/questions/192249/how-do-i-parse-command-line-arguments-in-bash/29754866#29754866
@@ -131,12 +131,7 @@ git fetch --depth 1 --no-tags origin "${fontconfig_commit}"
131131
git reset --hard FETCH_HEAD
132132
popd
133133

134-
## Hooks
135-
python src/build/util/lastchange.py -o src/build/util/LASTCHANGE
136-
python src/tools/download_cros_provided_profile.py --newest_state=src/chrome/android/profiles/newest.txt --local_state=src/chrome/android/profiles/local.txt --output_name=src/chrome/android/profiles/afdo.prof --gs_url_base=chromeos-prebuilt/afdo-job/llvm
137-
python src/build/util/lastchange.py -m GPU_LISTS_VERSION --revision-id-only --header src/gpu/config/gpu_lists_version.h
138-
python src/build/util/lastchange.py -m SKIA_COMMIT_HASH -s src/third_party/skia --header src/skia/ext/skia_commit_hash.h
139-
# New binary dependency: node, caused by webui
134+
# New binary dependency: node
140135
mkdir -p src/third_party/node/linux/node-linux-x64/bin
141136
ln -s /usr/bin/node src/third_party/node/linux/node-linux-x64/bin/
142137
src/third_party/node/update_npm_deps
@@ -152,6 +147,12 @@ ln -s /usr/bin/javap src/third_party/jdk/current/bin/
152147
mkdir -p src/third_party/jdk/extras/java_8
153148
ln -s /usr/lib/jvm/java-8-openjdk/jre src/third_party/jdk/extras/java_8
154149

150+
## Hooks
151+
python src/build/util/lastchange.py -o src/build/util/LASTCHANGE
152+
python src/tools/download_cros_provided_profile.py --newest_state=src/chrome/android/profiles/newest.txt --local_state=src/chrome/android/profiles/local.txt --output_name=src/chrome/android/profiles/afdo.prof --gs_url_base=chromeos-prebuilt/afdo-job/llvm
153+
python src/build/util/lastchange.py -m GPU_LISTS_VERSION --revision-id-only --header src/gpu/config/gpu_lists_version.h
154+
python src/build/util/lastchange.py -m SKIA_COMMIT_HASH -s src/third_party/skia --header src/skia/ext/skia_commit_hash.h
155+
155156

156157
## Run ungoogled-chromium scripts
157158
# Patch prune list and domain substitution

‎misc/android_studio_setup.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
set -eux -o pipefail
33

4-
chromium_version=81.0.4044.129
4+
chromium_version=81.0.4044.138
55
chrome_target=chrome_public_apk
66
monochrome_target=monochrome_public_apk
77
webview_target=system_webview_apk
@@ -33,7 +33,7 @@ cat ../android_flags.debug.gn ../android_flags.gn > ${output_folder}/args.gn
3333
gn gen ${output_folder} --fail-on-unused-args
3434

3535
# Compile apk
36-
/usr/bin/ninja -C ${output_folder} ${monochrome_target}
36+
ninja -C ${output_folder} ${monochrome_target}
3737
popd
3838

3939
###

‎patches/Kiwi/gn.patch‎

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,69 +1180,3 @@
11801180
deps += [ "//chrome/browser/resources:dev_ui_paks" ]
11811181
}
11821182

1183-
--- a/tools/json_schema_compiler/feature_compiler.py
1184-
+++ b/tools/json_schema_compiler/feature_compiler.py
1185-
@@ -48,7 +48,7 @@ CC_FILE_BEGIN = """
1186-
// %(source_files)s
1187-
// DO NOT EDIT.
1188-
1189-
-#include "%(header_file_path)s"
1190-
+#include "%(header_file_root_path)s/%(header_file_path)s"
1191-
1192-
#include "extensions/common/features/complex_feature.h"
1193-
#include "extensions/common/features/feature_provider.h"
1194-
@@ -636,13 +636,14 @@ class FeatureCompiler(object):
1195-
"""A compiler to load, parse, and generate C++ code for a number of
1196-
features.json files."""
1197-
def __init__(self, chrome_root, source_files, feature_type,
1198-
- method_name, out_root, out_base_filename):
1199-
+ method_name, out_root, root_build_dir, out_base_filename):
1200-
# See __main__'s ArgumentParser for documentation on these properties.
1201-
self._chrome_root = chrome_root
1202-
self._source_files = source_files
1203-
self._feature_type = feature_type
1204-
self._method_name = method_name
1205-
self._out_root = out_root
1206-
+ self._root_build_dir = root_build_dir
1207-
self._out_base_filename = out_base_filename
1208-
1209-
# The json value for the feature files.
1210-
@@ -784,9 +785,11 @@ class FeatureCompiler(object):
1211-
if include_file_root.startswith(GEN_DIR_PREFIX):
1212-
include_file_root = include_file_root[len(GEN_DIR_PREFIX):]
1213-
header_file_path = '%s/%s' % (include_file_root, header_file)
1214-
+ header_file_root_path = self._root_build_dir.replace("//", "")
1215-
cc_file_path = '%s/%s' % (include_file_root, cc_file)
1216-
substitutions = ({
1217-
'header_file_path': header_file_path,
1218-
+ 'header_file_root_path': header_file_root_path,
1219-
'header_guard': (header_file_path.replace('/', '_').
1220-
replace('.', '_').upper()),
1221-
'method_name': self._method_name,
1222-
@@ -825,6 +828,8 @@ if __name__ == '__main__':
1223-
help='The name of the method to populate the provider')
1224-
parser.add_argument('out_root', type=str,
1225-
help='The root directory to generate the C++ files into')
1226-
+ parser.add_argument('root_build_dir', type=str,
1227-
+ help='The base path of the build directory')
1228-
parser.add_argument(
1229-
'out_base_filename', type=str,
1230-
help='The base filename for the C++ files (.h and .cc will be appended)')
1231-
@@ -835,6 +840,7 @@ if __name__ == '__main__':
1232-
raise NameError('Unknown feature type: %s' % args.feature_type)
1233-
c = FeatureCompiler(args.chrome_root, args.source_files, args.feature_type,
1234-
args.method_name, args.out_root,
1235-
+ args.root_build_dir,
1236-
args.out_base_filename)
1237-
c.Load()
1238-
c.Compile()
1239-
--- a/tools/json_schema_compiler/json_features.gni
1240-
+++ b/tools/json_schema_compiler/json_features.gni
1241-
@@ -42,6 +42,7 @@ template("json_features") {
1242-
"$feature_type",
1243-
"$method_name",
1244-
rebase_path(target_gen_dir, root_build_dir),
1245-
+ "$root_build_dir",
1246-
"$base_filename",
1247-
] + rebased
1248-

‎patches/Kiwi/src.patch‎

Lines changed: 38 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
chrome/browser/first_run/upgrade_util.h | 2
3333
chrome/browser/hid/hid_chooser_context.cc | 5
3434
chrome/browser/lifetime/application_lifetime.cc | 22
35+
chrome/browser/lifetime/application_lifetime.h | 4
3536
chrome/browser/lifetime/browser_shutdown.cc | 6
3637
chrome/browser/lifetime/browser_shutdown.h | 4
3738
chrome/browser/media/router/media_router.h | 4
@@ -76,7 +77,6 @@
7677
chrome/browser/search/local_ntp_source.h | 2
7778
chrome/browser/search/most_visited_iframe_source.h | 2
7879
chrome/browser/sessions/session_restore.cc | 25
79-
chrome/browser/sessions/session_restore_android.cc | 27
8080
chrome/browser/sharing/shared_clipboard/feature_flags.cc | 2
8181
chrome/browser/sharing/shared_clipboard/feature_flags.h | 2
8282
chrome/browser/storage/storage_notification_service_impl.cc | 2
@@ -193,6 +193,7 @@
193193
ui/base/dragdrop/os_exchange_data_provider_factory.cc | 4
194194
ui/events/event.h | 1
195195
ui/native_theme/native_theme_android.cc | 3
196+
ui/native_theme/native_theme_android.h | 2
196197
ui/views/controls/menu/menu_controller.h | 1
197198
ui/views/controls/menu/menu_host.cc | 8
198199
ui/views/controls/menu/menu_host.h | 2
@@ -213,7 +214,7 @@
213214
ui/views/widget/widget.cc | 6
214215
weblayer/browser/browser_context_impl.cc | 2
215216
weblayer/browser/browser_context_impl.h | 2
216-
214 files changed, 3129 insertions(+), 625 deletions(-)
217+
215 files changed, 3132 insertions(+), 601 deletions(-)
217218

218219
--- /dev/null
219220
+++ b/chrome/browser/web_applications/components/web_app_shortcut_android.cc
@@ -2006,6 +2007,21 @@
20062007
}
20072008
#endif
20082009

2010+
--- a/ui/native_theme/native_theme_android.h
2011+
+++ b/ui/native_theme/native_theme_android.h
2012+
@@ -20,11 +20,11 @@ class NativeThemeAndroid : public Native
2013+
const ExtraParams& extra) const override;
2014+
SkColor GetSystemColor(ColorId color_id,
2015+
ColorScheme color_scheme) const override;
2016+
+ static NativeThemeAndroid* instance();
2017+
2018+
protected:
2019+
friend class NativeTheme;
2020+
friend class base::NoDestructor<NativeThemeAndroid>;
2021+
- static NativeThemeAndroid* instance();
2022+
2023+
// NativeThemeBase:
2024+
void AdjustCheckboxRadioRectForPadding(SkRect* rect) const override;
20092025
--- a/content/browser/storage_partition_impl.h
20102026
+++ b/content/browser/storage_partition_impl.h
20112027
@@ -50,7 +50,7 @@
@@ -4742,39 +4758,6 @@
47424758
bool SessionRestore::IsRestoring(const Profile* profile) {
47434759
if (active_session_restorers == nullptr)
47444760
return false;
4745-
--- a/chrome/browser/sessions/session_restore_android.cc
4746-
+++ b/chrome/browser/sessions/session_restore_android.cc
4747-
@@ -61,30 +61,3 @@ std::vector<Browser*> SessionRestore::Re
4748-
NOTREACHED();
4749-
return std::vector<Browser*>();
4750-
}
4751-
-
4752-
-// static
4753-
-void SessionRestore::AddObserver(SessionRestoreObserver* observer) {
4754-
- observers()->AddObserver(observer);
4755-
-}
4756-
-
4757-
-// static
4758-
-void SessionRestore::RemoveObserver(SessionRestoreObserver* observer) {
4759-
- observers()->RemoveObserver(observer);
4760-
-}
4761-
-
4762-
-// static
4763-
-bool SessionRestore::IsRestoring(const Profile* profile) {
4764-
- return false;
4765-
-}
4766-
-
4767-
-// static
4768-
-Browser* SessionRestore::RestoreSession(
4769-
- Profile* profile, Browser* browser,
4770-
- SessionRestore::BehaviorBitmask behavior,
4771-
- const std::vector<GURL>& urls_to_open) {
4772-
- return nullptr;
4773-
-}
4774-
-
4775-
-// static
4776-
-base::ObserverList<SessionRestoreObserver>::Unchecked*
4777-
- SessionRestore::observers_ = nullptr;
47784761
--- /dev/null
47794762
+++ b/chrome/browser/obsolete_system/obsolete_system_android.cc
47804763
@@ -0,0 +1,25 @@
@@ -6829,3 +6812,23 @@
68296812
base::FilePath GetPath() override;
68306813
bool IsOffTheRecord() override;
68316814
content::ResourceContext* GetResourceContext() override;
6815+
--- a/chrome/browser/lifetime/application_lifetime.h
6816+
+++ b/chrome/browser/lifetime/application_lifetime.h
6817+
@@ -31,7 +31,7 @@ void AttemptRestart();
6818+
// entire OS, instead of just relaunching the browser.
6819+
void AttemptRelaunch();
6820+
6821+
-#if !defined(OS_ANDROID)
6822+
+#if defined(OS_ANDROID)
6823+
// Starts an administrator-initiated relaunch process. On platforms other than
6824+
// Chrome OS, this relaunches the browser and restores the user's session. On
6825+
// Chrome OS, this restarts the entire OS. This differs from AttemptRelaunch in
6826+
@@ -62,7 +62,7 @@ void ExitIgnoreUnloadHandlers();
6827+
bool IsAttemptingShutdown();
6828+
#endif
6829+
6830+
-#if !defined(OS_ANDROID)
6831+
+#if defined(OS_ANDROID)
6832+
// Closes all browsers and if successful, quits.
6833+
void CloseAllBrowsersAndQuit();
6834+

‎patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.auth.patch‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ Subject: Remove dependency on com.google.android.gms.auth
88
components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountIdProvider.java | 7 -
99
components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java | 12 --
1010
content/public/android/BUILD.gn | 1
11-
content/public/android/java/src/org/chromium/content/browser/sms/SmsReceiver.java | 40 ---------
11+
content/public/android/java/src/org/chromium/content/browser/sms/SmsReceiver.java | 38 --------
1212
content/public/android/java/src/org/chromium/content/browser/sms/Wrappers.java | 10 --
1313
third_party/android_deps/BUILD.gn | 44 ----------
1414
third_party/robolectric/BUILD.gn | 1
15-
9 files changed, 4 insertions(+), 113 deletions(-)
15+
9 files changed, 4 insertions(+), 111 deletions(-)
1616

1717
--- a/chrome/android/BUILD.gn
1818
+++ b/chrome/android/BUILD.gn
@@ -95,17 +95,15 @@ Subject: Remove dependency on com.google.android.gms.auth
9595
import org.chromium.base.ContextUtils;
9696
import org.chromium.base.Log;
9797
import org.chromium.base.annotations.CalledByNative;
98-
@@ -51,9 +46,6 @@ public class SmsReceiver extends Broadca
99-
// If this broadcast receiver becomes more heavyweight, we should make
98+
@@ -52,7 +47,6 @@ public class SmsReceiver extends Broadca
10099
// this registration expire after the SMS message is received.
101100
if (DEBUG) Log.d(TAG, "Registering intent filters.");
102-
- IntentFilter filter = new IntentFilter();
101+
IntentFilter filter = new IntentFilter();
103102
- filter.addAction(SmsRetriever.SMS_RETRIEVED_ACTION);
104-
- mContext.registerReceiver(this, filter);
103+
mContext.registerReceiver(this, filter);
105104
}
106105

107-
@CalledByNative
108-
@@ -77,49 +69,19 @@ public class SmsReceiver extends Broadca
106+
@@ -77,49 +71,19 @@ public class SmsReceiver extends Broadca
109107
return;
110108
}
111109

0 commit comments

Comments
 (0)