Browse Source

Update to 94.0.4606.81-1

tags/94.0.4606.81-1^0 94.0.4606.81-1-webview
wchen342 2 weeks ago
parent
commit
4f67b91019
Signed by: wchen342 GPG Key ID: 9C19365D69B04CEC
8 changed files with 14 additions and 272 deletions
  1. +2
    -2
      .build_config
  2. +3
    -0
      CHANGELOG.md
  3. BIN
      androidx-override/core-release.aar
  4. +0
    -50
      androidx-override/core_core.patch
  5. +8
    -29
      build.sh
  6. +1
    -1
      patches/Bromite/Add-option-to-not-persist-tabs-across-sessions.patch
  7. +0
    -2
      patches/series
  8. +0
    -188
      patches/ungoogled-chromium-android/Remove-reference-to-android-s.patch

+ 2
- 2
.build_config View File

@ -10,7 +10,7 @@ trichrome_webview_target=trichrome_webview_apk
trichrome_webview_64_target=trichrome_webview_64_apk
all=all
chromium_version=94.0.4606.71
ungoogled_chromium_version=94.0.4606.71
chromium_version=94.0.4606.81
ungoogled_chromium_version=94.0.4606.81
ungoogled_chromium_revision=1
ungoogled_chromium_android_revision=1

+ 3
- 0
CHANGELOG.md View File

@ -1,3 +1,6 @@
# 94.0.4606.81-1
* Now using Android SDK 12 r02
# 94.0.4606.71-1
* Bookmark import-export is disabled (again)
* Now built with Android SDK rebuilt from s-beta-5 (Android 12 beta) and NDK r23. If you want to know how they are built, see [here](https://github.com/wchen342/android-rebuilds).


BIN
androidx-override/core-release.aar View File


+ 0
- 50
androidx-override/core_core.patch View File

@ -1,50 +0,0 @@
diff --git a/frameworks/support/core/core/src/main/res/attrs.xml b/frameworks/support/core/core/src/main/res/attrs.xml
--- a/frameworks/support/core/core/src/main/res/attrs.xml
+++ b/frameworks/support/core/core/src/main/res/attrs.xml
@@ -110,9 +110,6 @@
<!-- Alpha multiplier applied to the base color. -->
<attr name="alpha" format="float" />
<attr name="android:alpha"/>
- <!-- Perceptual luminance applied to the base color. From 0 to 100. -->
- <attr name="lStar" format="float" />
- <attr name="android:lStar" />
</declare-styleable>
<!-- Used to describe the gradient for fill or stroke in a path of VectorDrawable. -->
diff --git a/frameworks/support/core/core/src/main/java/androidx/core/content/res/ColorStateListInflaterCompat.java b/frameworks/support/core/core/src/main/java/androidx/core/content/res/ColorStateListInflaterCompat.java
--- a/frameworks/support/core/core/src/main/java/androidx/core/content/res/ColorStateListInflaterCompat.java
+++ b/frameworks/support/core/core/src/main/java/androidx/core/content/res/ColorStateListInflaterCompat.java
@@ -167,14 +167,6 @@ public final class ColorStateListInflaterCompat {
alphaMod = a.getFloat(R.styleable.ColorStateListItem_alpha, alphaMod);
}
- final float lStar;
- if (BuildCompat.isAtLeastS()
- && a.hasValue(R.styleable.ColorStateListItem_android_lStar)) {
- lStar = a.getFloat(R.styleable.ColorStateListItem_android_lStar, -1.0f);
- } else {
- lStar = a.getFloat(R.styleable.ColorStateListItem_lStar, -1.0f);
- }
-
a.recycle();
// Parse all unrecognized attributes as state specifiers.
@@ -185,8 +177,7 @@ public final class ColorStateListInflaterCompat {
final int stateResId = attrs.getAttributeNameResource(i);
if (stateResId != android.R.attr.color
&& stateResId != android.R.attr.alpha
- && stateResId != R.attr.alpha
- && stateResId != R.attr.lStar) {
+ && stateResId != R.attr.alpha) {
// Unrecognized attribute, add to state set
stateSpec[j++] = attrs.getAttributeBooleanValue(i, false)
? stateResId : -stateResId;
@@ -197,7 +188,7 @@ public final class ColorStateListInflaterCompat {
// Apply alpha and luminance modulation. If we couldn't resolve the color or
// alpha yet, the default values leave us enough information to
// modulate again during applyTheme().
- final int color = modulateColorAlpha(baseColor, alphaMod, lStar);
+ final int color = modulateColorAlpha(baseColor, alphaMod, -1.0f);
colorList = GrowingArrayUtils.append(colorList, listSize, color);
stateSpecList = GrowingArrayUtils.append(stateSpecList, listSize, stateSpec);

+ 8
- 29
build.sh View File

@ -3,8 +3,6 @@ set -eu -o pipefail
# Required packages: passwd protobuf java-1.8.0-openjdk-headless java-1.8.0-openjdk-devel gperf wget rsync tar unzip gnupg2 curl maven yasm npm ninja-build nodejs git clang lld llvm flex bison libdrm-devel nss-devel dbus-devel libstdc++-static libatomic-static krb5-devel glib2 glib2-devel glibc.i686 glibc-devel.i686 fakeroot-libs.i686 libgcc.i686 libtool-ltdl.i686 libtool-ltdl-devel.i686
# gn from OpenSUSE Tumbleweed.
# Assuming python2.
# TODO: it seems python3 will finally land with cr93
source .build_config
@ -245,12 +243,8 @@ popd
# Some of the support libraries can be grabbed from maven https://android.googlesource.com/platform/prebuilts/maven_repo/android/+/master/com/android/support/
## Prepare Android SDK/NDK
# TODO: Failed to build on s-beta-5. Something is missing in the beta sdk.
# Need to test again when Android 12 releases. For now remove any code references to Android 12.
# SDK_DIR="android-sdk_eng.11.0.0_r27_linux-x86"
# SDK_VERSION_CODE="11"
SDK_DIR="android-sdk_eng.s-beta-5_linux-x86"
SDK_VERSION_CODE="Tiramisu"
SDK_NAME="android-sdk_eng.12.0.0_r2_linux-x86"
SDK_VERSION_CODE="12"
# 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
@ -260,11 +254,11 @@ if [[ -d "$DIRECTORY" ]]; then
find $DIRECTORY -mindepth 1 -maxdepth 1 -not -name cmdline-tools -exec rm -rf '{}' \;
fi
pushd ${DIRECTORY}
mkdir build-tools && ln -s ../../../../../android-sdk/${SDK_DIR}/build-tools/android-${SDK_VERSION_CODE} build-tools/31.0.0
mkdir build-tools && ln -s ../../../../../android-sdk/${SDK_NAME}/build-tools/android-${SDK_VERSION_CODE} build-tools/31.0.0
mkdir platforms
ln -s ../../../../../android-sdk/${SDK_DIR}/platforms/android-${SDK_VERSION_CODE} platforms/android-31
ln -s ../../../../android-sdk/${SDK_DIR}/platform-tools platform-tools
ln -s ../../../../android-sdk/${SDK_DIR}/tools tools
ln -s ../../../../../android-sdk/${SDK_NAME}/platforms/android-${SDK_VERSION_CODE} platforms/android-31
ln -s ../../../../android-sdk/${SDK_NAME}/platform-tools platform-tools
ln -s ../../../../android-sdk/${SDK_NAME}/tools tools
popd
# remove ndk folders
@ -282,8 +276,8 @@ popd
mkdir android-sdk
mkdir android-ndk
pushd android-rebuilds
unzip -qqo android-sdk_eng.s-beta-5_linux-x86.zip -d ../android-sdk && mv ../android-sdk/android-sdk_eng.build_linux-x86 ../android-sdk/android-sdk_eng.s-beta-5_linux-x86 && rm -f android-sdk_eng.s-beta-5_linux-x86.zip && s=0 || s=$? && (exit $s)
unzip -qqo sdk-repo-linux-tools-26.1.1.zip -d ../android-sdk/android-sdk_eng.s-beta-5_linux-x86 && rm -f sdk-repo-linux-tools-26.1.1.zip && s=0 || s=$? && (exit $s)
unzip -qqo ${SDK_NAME}.zip -d ../android-sdk && mv ../android-sdk/android-sdk_eng.build_linux-x86 ../android-sdk/${SDK_NAME} && rm -f ${SDK_NAME}.zip && s=0 || s=$? && (exit $s)
unzip -qqo sdk-repo-linux-tools-26.1.1.zip -d ../android-sdk/${SDK_NAME} && rm -f sdk-repo-linux-tools-26.1.1.zip && s=0 || s=$? && (exit $s)
unzip -qqo android-ndk-r23-linux-x86_64.zip -d ../android-ndk && rm -f android-ndk-r23-linux-x86_64.zip && s=0 || s=$? && (exit $s)
popd
@ -292,9 +286,6 @@ cp -a "ndk_temp/${gn_file}" android-ndk/android-ndk-r23
cp -ar "ndk_temp/linux-x86_64" android-ndk/android-ndk-r23/toolchains/llvm/prebuilt
rm -rf "ndk_temp"
# SDK needs the old aidl because an import failure
cp misc/aidl src/third_party/android_sdk/public/build-tools/31.0.0
# Additional Source Patches
## Extra fixes for Chromium source
python3 ungoogled-chromium/utils/patches.py apply src patches
@ -311,14 +302,6 @@ fi
python3 ungoogled-chromium/utils/domain_substitution.py apply -r ungoogled-chromium/domain_regex.list -f ${substitution_list_2} -c ${cache_file} src
# Override androidx libraries
# This is to remove Android S APIs because they don't exist in the public version of SDK yet. See androidx-override/core_core.patch for changes.
lib_path=$(find .cipd -name core-1.7.0-SNAPSHOT.aar | cut -d/ -f-6)
chmod +w "${lib_path}"/core-1.7.0-SNAPSHOT.aar
ls -l "${lib_path}"
cp androidx-override/core-release.aar "${lib_path}"/core-1.7.0-SNAPSHOT.aar
ls -l .cipd/pkgs # DEBUG
## Configure output folder
export PATH=$OLD_PATH # remove depot_tools from PATH
pushd src
@ -334,10 +317,6 @@ printf '\ntarget_cpu="'"$ARCH"'"\n' >> "${output_folder}"/args.gn
# Trichrome doesn't forward version_name to base in bundle
printf '\nandroid_override_version_name="'"${chromium_version}"'"\n' >> "${output_folder}"/args.gn
# Update aar.info for override
chmod 644 ../"${lib_path}"/androidx_core_core.info
printf '\nupdate_android_aar_prebuilts=true' >> "${output_folder}"/args.gn
gn gen "${output_folder}" --fail-on-unused-args
popd


+ 1
- 1
patches/Bromite/Add-option-to-not-persist-tabs-across-sessions.patch View File

@ -91,7 +91,7 @@ Subject: Add option to not persist tabs across sessions
private ChromeManagedPreferenceDelegate createManagedPreferenceDelegate() {
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -4061,6 +4061,12 @@ To change this setting, <ph name="BEGIN_
@@ -4043,6 +4043,12 @@ To change this setting, <ph name="BEGIN_
<message name="IDS_CONTEXTMENU_IMAGE_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the image.">
IMAGE
</message>


+ 0
- 2
patches/series View File

@ -60,7 +60,5 @@ Bromite/Disable-DRM-media-origin-IDs-preprovisioning.patch
Bromite/AImageReader-CFI-crash-mitigations.patch
Bromite/Add-an-always-incognito-mode.patch
ungoogled-chromium-android/Remove-reference-to-android-s.patch
Other/debug-fix.patch

+ 0
- 188
patches/ungoogled-chromium-android/Remove-reference-to-android-s.patch View File

@ -1,188 +0,0 @@
description: For whatever reason the new APIs are not in beta SDK yet. Remove reference to Android S until we can update sdk rebuilds.
author: Wengling Chen <[email protected]>
---
base/android/java/src/org/chromium/base/compat/ApiHelperForS.java | 13 ++-----
chrome/android/java/AndroidManifest.xml | 2 -
chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java | 2 -
chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java | 7 ----
chrome/browser/share/android/java_sources.gni | 2 -
components/permissions/android/java/src/org/chromium/components/permissions/BluetoothChooserDialog.java | 17 ----------
device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java | 5 --
7 files changed, 9 insertions(+), 39 deletions(-)
--- a/base/android/java/src/org/chromium/base/compat/ApiHelperForS.java
+++ b/base/android/java/src/org/chromium/base/compat/ApiHelperForS.java
@@ -36,7 +36,7 @@ public final class ApiHelperForS {
* See {@link ClipDescription#isStyleText()}.
*/
public static boolean isStyleText(ClipDescription clipDescription) {
- return clipDescription.isStyledText();
+ return false;
}
/**
@@ -44,7 +44,7 @@ public final class ApiHelperForS {
*/
public static float getConfidenceScore(
ClipDescription clipDescription, @NonNull String entityType) {
- return clipDescription.getConfidenceScore(entityType);
+ return 0.f;
}
/**
@@ -52,20 +52,18 @@ public final class ApiHelperForS {
* ClipDescription.CLASSIFICATION_COMPLETE.
*/
public static boolean isGetClassificationStatusIsComplete(ClipDescription clipDescription) {
- return clipDescription.getClassificationStatus() == ClipDescription.CLASSIFICATION_COMPLETE;
+ return false;
}
/**
* See {@link ClipData.Item#getTextLinks()}.
*/
public static TextLinks getTextLinks(ClipData.Item item) {
- return item.getTextLinks();
+ return null;
}
public static boolean hasBluetoothConnectPermission() {
- return ApiCompatibilityUtils.checkPermission(ContextUtils.getApplicationContext(),
- Manifest.permission.BLUETOOTH_CONNECT, Process.myPid(), Process.myUid())
- == PackageManager.PERMISSION_GRANTED;
+ return false;
}
/**
@@ -73,6 +71,5 @@ public final class ApiHelperForS {
*/
public static void setAutoEnterEnabled(
PictureInPictureParams.Builder builder, boolean enabled) {
- builder.setAutoEnterEnabled(enabled);
}
}
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -57,7 +57,7 @@ by a child template that "extends" this
filtered view of devices.
-->
<uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_SCAN"
- android:usesPermissionFlags="neverForLocation"/>
+ />
<uses-permission-sdk-23 android:name="android.permission.READ_CONTACTS"/>
<uses-permission-sdk-23 android:name="android.permission.REORDER_TASKS"/>
--- a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java
+++ b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java
@@ -220,10 +220,7 @@ final class ChromeBluetoothAdapter exten
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
Context context = mAdapter.getContext();
- return context.checkCallingOrSelfPermission(Manifest.permission.BLUETOOTH_SCAN)
- == PackageManager.PERMISSION_GRANTED
- && context.checkCallingOrSelfPermission(Manifest.permission.BLUETOOTH_CONNECT)
- == PackageManager.PERMISSION_GRANTED;
+ return false;
}
LocationUtils locationUtils = LocationUtils.getInstance();
--- a/components/permissions/android/java/src/org/chromium/components/permissions/BluetoothChooserDialog.java
+++ b/components/permissions/android/java/src/org/chromium/components/permissions/BluetoothChooserDialog.java
@@ -361,16 +361,9 @@ public class BluetoothChooserDialog
break;
case LinkType.REQUEST_PERMISSIONS:
mItemChooserDialog.setIgnorePendingWindowFocusChangeForClose(true);
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
- mWindowAndroid.requestPermissions(
- new String[] {Manifest.permission.BLUETOOTH_SCAN,
- Manifest.permission.BLUETOOTH_CONNECT},
- BluetoothChooserDialog.this);
- } else {
- mWindowAndroid.requestPermissions(
+ mWindowAndroid.requestPermissions(
new String[] {Manifest.permission.ACCESS_FINE_LOCATION},
BluetoothChooserDialog.this);
- }
break;
case LinkType.REQUEST_LOCATION_SERVICES:
mItemChooserDialog.setIgnorePendingWindowFocusChangeForClose(true);
@@ -393,19 +386,11 @@ public class BluetoothChooserDialog
}
private static boolean hasSystemPermissions(WindowAndroid windowAndroid) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
- return windowAndroid.hasPermission(Manifest.permission.BLUETOOTH_SCAN)
- && windowAndroid.hasPermission(Manifest.permission.BLUETOOTH_CONNECT);
- }
return windowAndroid.hasPermission(Manifest.permission.ACCESS_FINE_LOCATION);
}
private static boolean canRequestSystemPermissions(WindowAndroid windowAndroid) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
- return windowAndroid.canRequestPermission(Manifest.permission.BLUETOOTH_SCAN)
- && windowAndroid.canRequestPermission(Manifest.permission.BLUETOOTH_CONNECT);
- }
return windowAndroid.canRequestPermission(Manifest.permission.ACCESS_FINE_LOCATION);
}
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
@@ -74,7 +74,6 @@ import org.chromium.chrome.browser.prefe
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.read_later.ReadLaterIPHController;
import org.chromium.chrome.browser.share.ShareDelegate;
-import org.chromium.chrome.browser.share.scroll_capture.ScrollCaptureManager;
import org.chromium.chrome.browser.signin.SyncConsentActivityLauncherImpl;
import org.chromium.chrome.browser.signin.ui.SigninPromoUtil;
import org.chromium.chrome.browser.status_indicator.StatusIndicatorCoordinator;
@@ -152,7 +151,6 @@ public class TabbedRootUiCoordinator ext
private TabObscuringHandler.Observer mContinuousSearchTabObscuringHandlerObserver;
private FindToolbarObserver mContinuousSearchFindToolbarObserver;
private MerchantTrustSignalsCoordinator mMerchantTrustSignalsCoordinator;
- private @Nullable ScrollCaptureManager mScrollCaptureManager;
private CommerceSubscriptionsService mCommerceSubscriptionsService;
private UndoGroupSnackbarController mUndoGroupSnackbarController;
private final IntentRequestTracker mIntentRequestTracker;
@@ -382,10 +380,6 @@ public class TabbedRootUiCoordinator ext
mCommerceSubscriptionsService = null;
}
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && mScrollCaptureManager != null) {
- mScrollCaptureManager.destroy();
- mScrollCaptureManager = null;
- }
super.onDestroy();
}
@@ -544,7 +538,6 @@ public class TabbedRootUiCoordinator ext
return;
}
- mScrollCaptureManager = new ScrollCaptureManager(mActivityTabProvider);
}
// Protected class methods
--- a/chrome/browser/share/android/java_sources.gni
+++ b/chrome/browser/share/android/java_sources.gni
@@ -51,8 +51,6 @@ share_java_sources = [
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotShareSheetView.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotShareSheetViewBinder.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotShareSheetViewProperties.java",
- "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/scroll_capture/ScrollCaptureCallbackImpl.java",
- "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/scroll_capture/ScrollCaptureManager.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/DevicePickerBottomSheetAdapter.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/DevicePickerBottomSheetContent.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/MetricsRecorder.java",
--- a/chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java
@@ -114,7 +114,7 @@ public class MultiWindowUtils implements
ComponentName comp = new ComponentName(packageName, className);
try {
int launchMode = context.getPackageManager().getActivityInfo(comp, 0).launchMode;
- return launchMode == ActivityInfo.LAUNCH_SINGLE_INSTANCE_PER_TASK;
+ return false;
} catch (PackageManager.NameNotFoundException e) {
return false;
}

Loading…
Cancel
Save