|
| 1 | +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Daniel Micay < [email protected]> |
| 3 | +Date: Sun, 28 Apr 2024 09:55:14 -0400 |
| 4 | +Subject: [PATCH] Revert "Add support for respecting OS configuration for |
| 5 | + denying execmem" |
| 6 | + |
| 7 | +This reverts commit 2036d5bdc8ab7e1724b90cf32c477c2a5f542754. |
| 8 | +--- |
| 9 | + .../chromium/base/library_loader/LibraryLoaderHooks.java | 6 ------ |
| 10 | + base/base_android_library_ext.gni | 1 - |
| 11 | + 2 files changed, 7 deletions(-) |
| 12 | + |
| 13 | +diff --git a/base/android/java/src/org/chromium/base/library_loader/LibraryLoaderHooks.java b/base/android/java/src/org/chromium/base/library_loader/LibraryLoaderHooks.java |
| 14 | +index 387a463a3a382..b1a621f62770a 100644 |
| 15 | +--- a/base/android/java/src/org/chromium/base/library_loader/LibraryLoaderHooks.java |
| 16 | ++++ b/base/android/java/src/org/chromium/base/library_loader/LibraryLoaderHooks.java |
| 17 | +@@ -2,11 +2,8 @@ package org.chromium.base.library_loader; |
| 18 | + |
| 19 | + import android.content.Context; |
| 20 | + |
| 21 | +-import org.chromium.base.command_line.VanadiumCommandLineUtils; |
| 22 | + import org.chromium.base.config.VanadiumConfigBridge; |
| 23 | + |
| 24 | +-import app.vanadium.ext.CustomOSApis; |
| 25 | +- |
| 26 | + class LibraryLoaderHooks { |
| 27 | + |
| 28 | + static void onSetLibraryProcessType(Context appContext, @LibraryProcessType int type) { |
| 29 | +@@ -15,9 +12,6 @@ class LibraryLoaderHooks { |
| 30 | + |
| 31 | + static void onBeforeCommandLineSwitchLocked(Context appContext, @LibraryProcessType int type) { |
| 32 | + VanadiumConfigBridge.applyFlagFromConfigs(appContext, type); |
| 33 | +- if (CustomOSApis.isExecmemBlocked()) { |
| 34 | +- VanadiumCommandLineUtils.appendValueOnSwitch("js-flags", "--jitless"); |
| 35 | +- } |
| 36 | + } |
| 37 | + |
| 38 | + static void onSubsequentCommandLineSwitchLockedCheck(Context appContext, @LibraryProcessType int type) { |
| 39 | +diff --git a/base/base_android_library_ext.gni b/base/base_android_library_ext.gni |
| 40 | +index 58ac6064b8c1c..714b393cc58b8 100644 |
| 41 | +--- a/base/base_android_library_ext.gni |
| 42 | ++++ b/base/base_android_library_ext.gni |
| 43 | +@@ -10,7 +10,6 @@ base_java_ext_java_sources = [ |
| 44 | + |
| 45 | + base_java_ext_deps = [ |
| 46 | + "//vanadium/android_config/proto:browser_config_parser_java", |
| 47 | +- "//vanadium/ext/custom_os:custom_os_apis_java", |
| 48 | + ] |
| 49 | + |
| 50 | + base_java_ext_srcjar_deps = [ |
0 commit comments