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

Commit ff3bc4a

Browse files
wchen342wchen342
committed
Change package name for extension version
1 parent fdc1088 commit ff3bc4a

File tree

13 files changed

+180
-35
lines changed

13 files changed

+180
-35
lines changed

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ assignees: ''
88
---
99

1010
**Is your feature request fall into the scope of ungoogled-chromium?**
11-
Please explain why the feature request aligns with the goal of ungoogled-chromium. [...]
11+
Please explain why the feature request aligns with the goal of ungoogled-chromium. See [ungoogled-chromium#objectives](https://github.com/Eloston/ungoogled-chromium#objectives) for a detailed list of objectives of this project. [...]
1212

1313
**Please describe the feature you would like to have**
1414
A clear and concise description of what the problem is. [...]

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# 83.0.4103.61-1
2+
* Add extension-support version
3+
* This version is highly experimental and is not intended for daily usage yet! See [README#Extensions](https://github.com/wchen342/ungoogled-chromium-android#extensions)
4+
* Extension removal is not implemented yet
5+
* The package will have a name `org.ungoogled.chromium.extensions`
6+
* Resolve [#20](https://github.com/wchen342/ungoogled-chromium-android/issues/20), [#23](https://github.com/wchen342/ungoogled-chromium-android/issues/23)
7+
* Partially resolve [#19](https://github.com/wchen342/ungoogled-chromium-android/issues/19), [#21](https://github.com/wchen342/ungoogled-chromium-android/issues/21)
8+
19
# 81.0.4044.138-1
210
* Fix a crash with incognito tab
311
* Minor fix for extension patches. From next release, `chrome`/`arm` target will include a beta version with extension support.

‎android_flags.gn‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ clang_base_path="/usr"
88
disable_android_lint=true
99
enable_gvr_services=false
1010
enable_resource_whitelist_generation=false
11-
enable_supervised_users=false
1211
ffmpeg_branding="Chrome"
1312
is_clang=true
1413
rtc_build_examples=false

‎build.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,9 @@ else
266266
cat ../android_flags.gn ../android_flags.debug.gn > out/Default/args.gn
267267
fi
268268
printf '\ntarget_cpu="'"$ARCH"'"\n' >> out/Default/args.gn
269-
printf '\nenable_extensions=true\n' >> out/Default/args.gn
269+
# Only used for extensions
270+
#printf '\nenable_extensions=true\n' >> out/Default/args.gn
271+
#printf '\nenable_supervised_users=false\n' >> out/Default/args.gn
270272
gn gen out/Default --fail-on-unused-args
271273
popd
272274

‎misc/android_studio_setup.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ pushd src
5656
output_folder=out/Debug_apk
5757
mkdir -p ${output_folder}
5858
cat ../android_flags.debug.gn ../android_flags.gn > ${output_folder}/args.gn
59-
printf '\ntarget_cpu="arm64"\n' >> ${output_folder}/args.gn
59+
printf '\ntarget_cpu="arm"\n' >> ${output_folder}/args.gn
6060
popd
6161

6262
# Run gn first

‎patches/Extensions/change-package-name-chromium-extensions.patch‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
description: change package name to allow co-existence with original Chromium
2+
author: Wengling Chen <feiyu2817@gmail.com>
3+
4+
---
5+
chrome/android/BUILD.gn | 4 ++--
6+
chrome/android/java/res_chromium/values/channel_constants.xml | 2 +-
7+
2 files changed, 3 insertions(+), 3 deletions(-)
8+
9+
--- a/chrome/android/BUILD.gn
10+
+++ b/chrome/android/BUILD.gn
11+
@@ -43,9 +43,9 @@ declare_args() {
12+
# WebView providers which declare one of a handful of package names. See
13+
# https://chromium.9oo91esource.qjz9zk/chromium/src/+/HEAD/android_webview/docs/build-instructions.md#Changing-package-name
14+
# for details.
15+
- chrome_public_manifest_package = "org.chromium.chrome"
16+
+ chrome_public_manifest_package = "org.ungoogled.chromium.extensions"
17+
}
18+
-chrome_public_test_manifest_package = "org.chromium.chrome.tests"
19+
+chrome_public_test_manifest_package = "org.ungoogled.chromium.extensions.tests"
20+
21+
chrome_public_jinja_variables =
22+
default_chrome_public_jinja_variables +
23+
--- a/chrome/android/java/res_chromium/values/channel_constants.xml
24+
+++ b/chrome/android/java/res_chromium/values/channel_constants.xml
25+
@@ -5,7 +5,7 @@
26+
27+
<resources xmlns:android="http://schemas.android.com/apk/res/android">
28+
<!-- The application name displayed to the user. -->
29+
- <string name="app_name" translatable="false">Chromium</string>
30+
+ <string name="app_name" translatable="false">Ungoogled Chromium Extensions</string>
31+
<string name="bookmark_widget_title" translatable="false">Chromium bookmarks</string>
32+
<string name="search_widget_title" translatable="false">Chromium search</string>
33+
</resources>

patches/Kiwi/gn.patch renamed to patches/Extensions/gn.patch

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
From: Wengling Chen <feiyu2817@gmail.com>
2+
Date: Sat, 30 May 2020 18:25:38 -0400
3+
Subject: gn fixes for enable_extensions=true
4+
15
---
26
apps/BUILD.gn | 2
37
build/config/locales.gni | 2

patches/Kiwi/res.patch renamed to patches/Extensions/res.patch

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
From: Wengling Chen <feiyu2817@gmail.com>
2+
Date: Sat, 30 May 2020 18:25:38 -0400
3+
Subject: resource fixes for enable_extensions=true
4+
15
---
26
chrome/app/bookmarks_strings.grdp | 6 +-
37
chrome/app/chromium_strings.grd | 20 +++----

patches/Kiwi/src.patch renamed to patches/Extensions/src.patch

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
From: Wengling Chen <feiyu2817@gmail.com>
2+
Date: Sat, 30 May 2020 18:25:38 -0400
3+
Subject: source code fixes for enable_extensions=true
4+
15
---
26
android_webview/browser/aw_browser_context.cc | 6
37
android_webview/browser/aw_browser_context.h | 2
@@ -8058,3 +8062,13 @@
80588062
break;
80598063
case TOGGLE_VISIBILITY: {
80608064
bool currently_visible = button_visibility_ == VISIBLE;
8065+
--- a/chrome/browser/ui/webui/settings/people_handler.cc
8066+
+++ b/chrome/browser/ui/webui/settings/people_handler.cc
8067+
@@ -711,7 +711,6 @@ void PeopleHandler::HandleSignout(const
8068+
}
8069+
8070+
void PeopleHandler::HandlePauseSync(const base::ListValue* args) {
8071+
- DCHECK(AccountConsistencyModeManager::IsDiceEnabledForProfile(profile_));
8072+
auto* identity_manager = IdentityManagerFactory::GetForProfile(profile_);
8073+
DCHECK(identity_manager->HasPrimaryAccount());
8074+

‎patches/debug-fix.patch‎

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,21 @@ Date: Tue, 26 May 2020 22:31:34 -0400
33
Subject: Remove DCHECK and other lines causing Debug builds to fail
44

55
---
6-
build/android/gyp/compile_java.py | 2
7-
build/config/compiler/BUILD.gn | 7 --
8-
cc/trees/layer_tree_host_impl.cc | 3
9-
chrome/browser/extensions/api/developer_private/developer_private_api.cc | 4 -
10-
chrome/browser/extensions/extension_context_menu_model.cc | 2
11-
chrome/browser/extensions/extension_tab_util.cc | 35 ++++------
12-
chrome/browser/extensions/extension_tab_util.h | 2
13-
chrome/browser/ui/webui/settings/people_handler.cc | 1
14-
components/omnibox/browser/autocomplete_controller.cc | 3
15-
components/omnibox/browser/autocomplete_match.cc | 10 --
16-
components/omnibox/browser/autocomplete_result.cc | 7 --
17-
components/omnibox/browser/shortcuts_backend.cc | 3
18-
components/policy/core/browser/configuration_policy_handler.cc | 1
19-
components/signin/internal/identity_manager/primary_account_manager.cc | 12 ---
20-
components/signin/internal/identity_manager/profile_oauth2_token_service_builder.cc | 1
21-
content/common/input/input_event_stream_validator.cc | 3
22-
services/network/network_context.cc | 1
23-
17 files changed, 23 insertions(+), 74 deletions(-)
6+
build/android/gyp/compile_java.py | 2 -
7+
build/config/compiler/BUILD.gn | 7 +----
8+
cc/trees/layer_tree_host_impl.cc | 3 --
9+
chrome/android/BUILD.gn | 1
10+
chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java | 14 ----------
11+
components/omnibox/browser/autocomplete_controller.cc | 3 --
12+
components/omnibox/browser/autocomplete_match.cc | 10 -------
13+
components/omnibox/browser/autocomplete_result.cc | 7 -----
14+
components/omnibox/browser/shortcuts_backend.cc | 3 --
15+
components/policy/core/browser/configuration_policy_handler.cc | 1
16+
components/signin/internal/identity_manager/primary_account_manager.cc | 12 --------
17+
components/signin/internal/identity_manager/profile_oauth2_token_service_builder.cc | 1
18+
content/common/input/input_event_stream_validator.cc | 3 --
19+
services/network/network_context.cc | 1
20+
14 files changed, 3 insertions(+), 65 deletions(-)
2421

2522
--- a/components/signin/internal/identity_manager/primary_account_manager.cc
2623
+++ b/components/signin/internal/identity_manager/primary_account_manager.cc
@@ -111,16 +108,6 @@ Subject: Remove DCHECK and other lines causing Debug builds to fail
111108
#endif
112109

113110
return std::make_unique<ProfileOAuth2TokenService>(
114-
--- a/chrome/browser/ui/webui/settings/people_handler.cc
115-
+++ b/chrome/browser/ui/webui/settings/people_handler.cc
116-
@@ -711,7 +711,6 @@ void PeopleHandler::HandleSignout(const
117-
}
118-
119-
void PeopleHandler::HandlePauseSync(const base::ListValue* args) {
120-
- DCHECK(AccountConsistencyModeManager::IsDiceEnabledForProfile(profile_));
121-
auto* identity_manager = IdentityManagerFactory::GetForProfile(profile_);
122-
DCHECK(identity_manager->HasPrimaryAccount());
123-
124111
--- a/components/omnibox/browser/autocomplete_match.cc
125112
+++ b/components/omnibox/browser/autocomplete_match.cc
126113
@@ -1213,16 +1213,6 @@ void AutocompleteMatch::TryAutocompleteW

0 commit comments

Comments
 (0)