|
| 1 | +diff --git a/base/android/java/src/org/chromium/base/process_launcher/BindService.java b/base/android/java/src/org/chromium/base/process_launcher/BindService.java |
| 2 | +index 0ada30fbcc4b8..4030cb9a5d9f0 100644 |
| 3 | +--- a/base/android/java/src/org/chromium/base/process_launcher/BindService.java |
| 4 | ++++ b/base/android/java/src/org/chromium/base/process_launcher/BindService.java |
| 5 | +@@ -28,7 +28,7 @@ final class BindService { |
| 6 | + |
| 7 | + static boolean supportVariableConnections() { |
| 8 | + return Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q |
| 9 | +- && !BuildConfig.IS_INCREMENTAL_INSTALL; |
| 10 | ++ && !true; // VisibleV8 android change required disabling renderer isolation. |
| 11 | + } |
| 12 | + |
| 13 | + // Note that handler is not guaranteed to be used, and client still need to correctly handle |
| 14 | +diff --git a/build/install-build-deps.py b/build/install-build-deps.py |
| 15 | +index a38ad22e967b7..6f3bc2ce20476 100755 |
| 16 | +--- a/build/install-build-deps.py |
| 17 | ++++ b/build/install-build-deps.py |
| 18 | +@@ -837,8 +837,15 @@ def install_packages(options): |
| 19 | + try: |
| 20 | + packages = find_missing_packages(options) |
| 21 | + if packages: |
| 22 | ++ env = os.environ.copy() |
| 23 | ++ env["LANGUAGE"] = "en" |
| 24 | ++ env["LANG"] = "C" |
| 25 | ++ env["DEBIAN_FRONTEND"] = 'noninteractive' |
| 26 | + quiet = ["-qq", "--assume-yes"] if options.no_prompt else [] |
| 27 | +- subprocess.check_call(["sudo", "apt-get", "install"] + quiet + packages) |
| 28 | ++ if options.no_prompt: |
| 29 | ++ subprocess.check_call(["sudo", "-E", "apt-get", "install"] + quiet + packages, env=env) |
| 30 | ++ else: |
| 31 | ++ subprocess.check_call(["sudo", "apt-get", "install"] + quiet + packages) |
| 32 | + print(file=sys.stderr) |
| 33 | + else: |
| 34 | + print("No missing packages, and the packages are up to date.", |
| 35 | +diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml |
| 36 | +index bd25a118d20e3..ca612f562e650 100644 |
| 37 | +--- a/chrome/android/java/AndroidManifest.xml |
| 38 | ++++ b/chrome/android/java/AndroidManifest.xml |
| 39 | +@@ -1233,13 +1233,13 @@ by a child template that "extends" this file. |
| 40 | + <service android:name="org.chromium.content.app.SandboxedProcessService{{ i }}" |
| 41 | + android:process=":sandboxed_process{{ i }}" |
| 42 | + android:permission="{{ manifest_package }}.permission.CHILD_SERVICE" |
| 43 | +- android:isolatedProcess="true" |
| 44 | ++ android:isolatedProcess="false" |
| 45 | + android:exported="{{sandboxed_service_exported|default(false)}}" |
| 46 | + {% if (i == 0) %} |
| 47 | + android:useAppZygote="true" |
| 48 | + {% endif %} |
| 49 | + {% if (sandboxed_service_exported|default(false)) == 'true' %} |
| 50 | +- android:externalService="true" |
| 51 | ++ android:externalService="false" |
| 52 | + tools:ignore="ExportedService" |
| 53 | + android:visibleToInstantApps="true" |
| 54 | + {% endif %} /> |
| 55 | +diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc |
| 56 | +index 4953e20861803..b2677fb3706a8 100644 |
| 57 | +--- a/content/renderer/renderer_main.cc |
| 58 | ++++ b/content/renderer/renderer_main.cc |
| 59 | +@@ -241,8 +241,7 @@ int RendererMain(MainFunctionParams parameters) { |
| 60 | + { |
| 61 | + content::ContentRendererClient* client = GetContentClient()->renderer(); |
| 62 | + bool should_run_loop = true; |
| 63 | +- bool need_sandbox = |
| 64 | +- !command_line.HasSwitch(sandbox::policy::switches::kNoSandbox); |
| 65 | ++ bool need_sandbox = false; // VisibleV8 disable sandbox for desktop |
| 66 | + |
| 67 | + if (!need_sandbox) { |
| 68 | + // The post-sandbox actions still need to happen at some point. |
0 commit comments