This repository was archived by the owner on Apr 1, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 56
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Change package name for extension version
- Loading branch information
Showing
13 changed files
with
180 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
patches/Extensions/change-package-name-chromium-extensions.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| description: change package name to allow co-existence with original Chromium | ||
| author: Wengling Chen <feiyu2817@gmail.com> | ||
|
|
||
| --- | ||
| chrome/android/BUILD.gn | 4 ++-- | ||
| chrome/android/java/res_chromium/values/channel_constants.xml | 2 +- | ||
| 2 files changed, 3 insertions(+), 3 deletions(-) | ||
|
|
||
| --- a/chrome/android/BUILD.gn | ||
| +++ b/chrome/android/BUILD.gn | ||
| @@ -43,9 +43,9 @@ declare_args() { | ||
| # WebView providers which declare one of a handful of package names. See | ||
| # https://chromium.9oo91esource.qjz9zk/chromium/src/+/HEAD/android_webview/docs/build-instructions.md#Changing-package-name | ||
| # for details. | ||
| - chrome_public_manifest_package = "org.chromium.chrome" | ||
| + chrome_public_manifest_package = "org.ungoogled.chromium.extensions" | ||
| } | ||
| -chrome_public_test_manifest_package = "org.chromium.chrome.tests" | ||
| +chrome_public_test_manifest_package = "org.ungoogled.chromium.extensions.tests" | ||
|
|
||
| chrome_public_jinja_variables = | ||
| default_chrome_public_jinja_variables + | ||
| --- a/chrome/android/java/res_chromium/values/channel_constants.xml | ||
| +++ b/chrome/android/java/res_chromium/values/channel_constants.xml | ||
| @@ -5,7 +5,7 @@ | ||
|
|
||
| <resources xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <!-- The application name displayed to the user. --> | ||
| - <string name="app_name" translatable="false">Chromium</string> | ||
| + <string name="app_name" translatable="false">Ungoogled Chromium Extensions</string> | ||
| <string name="bookmark_widget_title" translatable="false">Chromium bookmarks</string> | ||
| <string name="search_widget_title" translatable="false">Chromium search</string> | ||
| </resources> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| src-fix/android-rlz-fix-missing-variable.patch | ||
| src-fix/fix-null-mInstanceID.patch | ||
| src-fix/fix-unkown-warning-clang-9.patch | ||
| src-fix/fix-safe-browsing-prefs.patch | ||
| src-fix/fix-prefs.patch | ||
| src-fix/fix-disabled-supervised-user.patch | ||
| Extensions/gn.patch | ||
| Extensions/src.patch | ||
| Extensions/res.patch | ||
| Extensions/change-package-name-chromium-extensions.patch | ||
| Vanadium/0020-disable-media-router-media-remoting-by-default.patch | ||
| Vanadium/0021-disable-media-router-by-default.patch | ||
| Unobtainium/kill-Auth.patch | ||
| Unobtainium/kill-GCM.patch | ||
| Unobtainium/kill-Location-fall-back-to-system.patch | ||
| Unobtainium/kill-Vision.patch | ||
| Unobtainium/kill-Translate.patch | ||
| Unobtainium/kill-TOS-and-metrics-opt-out.patch | ||
| ungoogled-chromium-android/Remove-dependency-on-com.google.android.gcm.patch | ||
| ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.gcm.patch | ||
| ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.auth.patch | ||
| ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.cast.patch | ||
| ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.fido-com.google.android.gms.iid-com.google.android.gms.instantapps-com.google.android.gms.location.patch | ||
| ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.vision-com.google.android.gms.clearcut-com.google.android.gms.phenotype.patch | ||
| ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.flags-com.google.android.gms.location.places-com.google.android.gms.stats.patch | ||
| ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.common-auth-signin-dynamic-com.google.android.gms.tasks.patch | ||
| ungoogled-chromium-android/Remove-dependency-on-com.google.android.play.patch | ||
| ungoogled-chromium-android/Remove-dependency-on-com.google.android.play.core.splitcompat-com.google.android.play.core.splitinstall.patch | ||
| ungoogled-chromium-android/Disable-contextual-search.patch | ||
| ungoogled-chromium-android/Disable-lite-mode-prompt.patch | ||
| ungoogled-chromium-android/Disable-prefetch.patch | ||
| ungoogled-chromium-android/Add-more-search-engines.patch | ||
| ungoogled-chromium-android/Add-folder-button-bookmark.patch | ||
| ungoogled-chromium-android/Mark-http-as-dangerous-mixed-content-warning.patch | ||
| Bromite/Add-exit-menu-item.patch | ||
| Bromite/Add-flag-to-disable-WebGL.patch | ||
| Bromite/Add-flags-to-disable-device-motion-and-orientation-APIs.patch | ||
| Bromite/Add-option-to-not-persist-tabs-across-sessions.patch | ||
| Bromite/Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch | ||
| Bromite/Change-default-webRTC-policy-to-not-use-any-address.patch | ||
| Bromite/Remove-account-permissions-from-manifest.patch | ||
| Bromite/Revert-flags-remove-disable-pull-to-refresh-effect.patch | ||
| Bromite/updater-disable-updater-pings.patch |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| From: Wengling Chen <feiyu2817@gmail.com> | ||
| Date: Sat, 30 May 2020 18:25:38 -0400 | ||
| Subject: fix for enable_supervised_users=false | ||
|
|
||
| --- | ||
| chrome/android/BUILD.gn | 1 | ||
| chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java | 14 ---------- | ||
| 2 files changed, 15 deletions(-) | ||
|
|
||
| --- a/chrome/android/BUILD.gn | ||
| +++ b/chrome/android/BUILD.gn | ||
| @@ -2718,7 +2718,6 @@ generate_jni("chrome_jni_headers") { | ||
| "java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataCounterBridge.java", | ||
| "java/src/org/chromium/chrome/browser/browsing_data/UrlFilterBridge.java", | ||
| "java/src/org/chromium/chrome/browser/childaccounts/ChildAccountFeedbackReporter.java", | ||
| - "java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java", | ||
| "java/src/org/chromium/chrome/browser/complex_tasks/TaskTabHelper.java", | ||
| "java/src/org/chromium/chrome/browser/complex_tasks/endpoint_fetcher/EndpointFetcher.java", | ||
| "java/src/org/chromium/chrome/browser/complex_tasks/endpoint_fetcher/EndpointResponse.java", | ||
| --- a/chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java | ||
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java | ||
| @@ -60,32 +60,18 @@ public class ChildAccountService { | ||
| * @param callback the callback to be called when the status changes. | ||
| */ | ||
| public static void listenForStatusChange(Callback<Boolean> callback) { | ||
| - ChildAccountServiceJni.get().listenForChildStatusReceived(callback); | ||
| } | ||
|
|
||
| - @CalledByNative | ||
| private static void reauthenticateChildAccount( | ||
| WindowAndroid windowAndroid, String accountName, final long nativeCallback) { | ||
| ThreadUtils.assertOnUiThread(); | ||
|
|
||
| Activity activity = windowAndroid.getActivity().get(); | ||
| if (activity == null) { | ||
| - PostTask.postTask(UiThreadTaskTraits.DEFAULT, | ||
| - () | ||
| - -> ChildAccountServiceJni.get().onReauthenticationResult( | ||
| - nativeCallback, false)); | ||
| return; | ||
| } | ||
|
|
||
| Account account = AccountUtils.createAccountFromName(accountName); | ||
| - AccountManagerFacadeProvider.getInstance().updateCredentials(account, activity, | ||
| - result | ||
| - -> ChildAccountServiceJni.get().onReauthenticationResult(nativeCallback, result)); | ||
| } | ||
|
|
||
| - @NativeMethods | ||
| - interface Natives { | ||
| - void listenForChildStatusReceived(Callback<Boolean> callback); | ||
| - void onReauthenticationResult(long callbackPtr, boolean reauthSuccessful); | ||
| - } | ||
| } |