-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- https://chromium-review.googlesource.com/c/chromium/src/+/5828084 (fix to some unrelated issue in dependency install script)
- Loading branch information
1 parent
ae1e5af
commit 13a37bc
Showing
3 changed files
with
1,618 additions
and
0 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
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 | ||
index d5ff40b18a365..3d8d5eef2b42e 100644 | ||
--- a/base/android/java/src/org/chromium/base/process_launcher/BindService.java | ||
+++ b/base/android/java/src/org/chromium/base/process_launcher/BindService.java | ||
@@ -27,7 +27,7 @@ final class BindService { | ||
|
||
static boolean supportVariableConnections() { | ||
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q | ||
- && !BuildConfig.IS_INCREMENTAL_INSTALL; | ||
+ && !true; // VisibleV8 android change required disabling renderer isolation. | ||
} | ||
|
||
// Note that handler is not guaranteed to be used, and client still need to correctly handle | ||
diff --git a/build/install-build-deps.py b/build/install-build-deps.py | ||
index 1c5393f837dfe..2e5af4e06ca17 100755 | ||
--- a/build/install-build-deps.py | ||
+++ b/build/install-build-deps.py | ||
@@ -851,8 +851,15 @@ def install_packages(options): | ||
try: | ||
packages = find_missing_packages(options) | ||
if packages: | ||
+ env = os.environ.copy() | ||
+ env["LANGUAGE"] = "en" | ||
+ env["LANG"] = "C" | ||
+ env["DEBIAN_FRONTEND"] = 'noninteractive' | ||
quiet = ["-qq", "--assume-yes"] if options.no_prompt else [] | ||
- subprocess.check_output(["sudo", "apt-get", "install"] + quiet + packages) | ||
+ if options.no_prompt: | ||
+ subprocess.check_call(["sudo", "-E", "apt-get", "install"] + quiet + packages, env=env) | ||
+ else: | ||
+ subprocess.check_call(["sudo", "apt-get", "install"] + quiet + packages) | ||
print(file=sys.stderr) | ||
else: | ||
print("No missing packages, and the packages are up to date.", | ||
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml | ||
index 0635acb3c2ff5..1716a71eb9beb 100644 | ||
--- a/chrome/android/java/AndroidManifest.xml | ||
+++ b/chrome/android/java/AndroidManifest.xml | ||
@@ -1224,13 +1224,13 @@ by a child template that "extends" this file. | ||
<service android:name="org.chromium.content.app.SandboxedProcessService{{ i }}" | ||
android:process=":sandboxed_process{{ i }}" | ||
android:permission="{{ manifest_package }}.permission.CHILD_SERVICE" | ||
- android:isolatedProcess="true" | ||
+ android:isolatedProcess="false" | ||
android:exported="{{sandboxed_service_exported|default(false)}}" | ||
{% if (i == 0) %} | ||
android:useAppZygote="true" | ||
{% endif %} | ||
{% if (sandboxed_service_exported|default(false)) == 'true' %} | ||
- android:externalService="true" | ||
+ android:externalService="false" | ||
tools:ignore="ExportedService" | ||
android:visibleToInstantApps="true" | ||
{% endif %} /> | ||
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc | ||
index 8ce56617fb3e9..23a36b174c5f3 100644 | ||
--- a/content/renderer/renderer_main.cc | ||
+++ b/content/renderer/renderer_main.cc | ||
@@ -234,8 +234,7 @@ int RendererMain(MainFunctionParams parameters) { | ||
{ | ||
content::ContentRendererClient* client = GetContentClient()->renderer(); | ||
bool should_run_loop = true; | ||
- bool need_sandbox = | ||
- !command_line.HasSwitch(sandbox::policy::switches::kNoSandbox); | ||
+ bool need_sandbox = false; // VisibleV8 disable sandbox for desktop | ||
|
||
if (!need_sandbox) { | ||
// The post-sandbox actions still need to happen at some point. |
Oops, something went wrong.