-
Notifications
You must be signed in to change notification settings - Fork 839
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Failed attempt of patching CRASH_URL_STRING by bytecode asm
- Loading branch information
1 parent
231aa8f
commit d0a3909
Showing
9 changed files
with
81 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
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
29 changes: 29 additions & 0 deletions
29
build/android/bytecode/java/org/brave/bytecode/BraveMinidumpUploaderClassAdapter.java
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,29 @@ | ||
/* Copyright (c) 2021 The Brave Authors. All rights reserved. | ||
* This Source Code Form is subject to the terms of the Mozilla Public | ||
* License, v. 2.0. If a copy of the MPL was not distributed with this file, | ||
* You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
||
package org.brave.bytecode; | ||
|
||
import org.objectweb.asm.ClassVisitor; | ||
|
||
|
||
public class BraveMinidumpUploaderClassAdapter extends BraveClassVisitor { | ||
static String sMinidumpUploaderClassName = "org/chromium/components/minidump_uploader/MinidumpUploader"; | ||
|
||
static String sBraveMinidumpUploaderClassName = "org/chromium/components/minidump_uploader/BraveMinidumpUploader"; | ||
|
||
public BraveMinidumpUploaderClassAdapter(ClassVisitor visitor) { | ||
super(visitor); | ||
//deleteField(sBraveMinidumpUploaderClassName, "CRASH_URL_STRING"); | ||
//makeProtectedField(sMinidumpUploaderClassName, "CRASH_URL_STRING"); | ||
|
||
deleteField(sMinidumpUploaderClassName, "CRASH_URL_STRING"); | ||
makeProtectedField(sBraveMinidumpUploaderClassName, "CRASH_URL_STRING"); | ||
|
||
|
||
|
||
// deleteField(sBraveEditUrlSuggestionProcessor, "mHasClearedOmniboxForFocus"); | ||
// makeProtectedField(sEditUrlSuggestionProcessor, "mHasClearedOmniboxForFocus"); | ||
} | ||
} |
19 changes: 19 additions & 0 deletions
19
...der/android/java/src/org/chromium/components/minidump_uploader/BraveMinidumpUploader.java
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,19 @@ | ||
/** | ||
* Copyright (c) 2021 The Brave Authors. All rights reserved. | ||
* This Source Code Form is subject to the terms of the Mozilla Public | ||
* License, v. 2.0. If a copy of the MPL was not distributed with this file, | ||
* You can obtain one at http://mozilla.org/MPL/2.0/. | ||
*/ | ||
|
||
package org.chromium.components.minidump_uploader; | ||
|
||
import org.chromium.components.minidump_uploader.MinidumpUploader; | ||
import org.chromium.base.Log; | ||
|
||
public class BraveMinidumpUploader extends MinidumpUploader { | ||
public static final String CRASH_URL_STRING = "https://cr.brave.com"; | ||
public BraveMinidumpUploader() { | ||
super(); | ||
Log.e("TAGAB", "BRAVE BraveMinidumpUploader.ctor (1) 000 CRASH_URL_STRING="+CRASH_URL_STRING); | ||
} | ||
} |
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,3 @@ | ||
brave_components_minidump_uploader_java_sources = [ | ||
"//brave/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/BraveMinidumpUploader.java", | ||
] |
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,12 @@ | ||
diff --git a/components/minidump_uploader/BUILD.gn b/components/minidump_uploader/BUILD.gn | ||
index 88b49397b8b9fc5ca82335885c7bad84d74eccc8..044744069779fda667c23bd7f6e164d0bd8adc94 100644 | ||
--- a/components/minidump_uploader/BUILD.gn | ||
+++ b/components/minidump_uploader/BUILD.gn | ||
@@ -45,6 +45,7 @@ android_library("minidump_uploader_java") { | ||
"android/java/src/org/chromium/components/minidump_uploader/util/NetworkPermissionUtil.java", | ||
] | ||
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ] | ||
+ sources += brave_components_minidump_uploader_java_sources | ||
} | ||
|
||
android_library("minidump_uploader_javatests") { |
13 changes: 13 additions & 0 deletions
13
...roid-java-src-org-chromium-components-minidump_uploader-MinidumpUploadCallable.java.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,13 @@ | ||
diff --git a/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadCallable.java b/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadCallable.java | ||
index a25e74c3d05433889fa219dcc855c69f121f6fd9..306106dc138a31fdf78416c70e1a49859254e490 100644 | ||
--- a/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadCallable.java | ||
+++ b/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadCallable.java | ||
@@ -47,7 +47,7 @@ public class MinidumpUploadCallable implements Callable<Integer> { | ||
|
||
public MinidumpUploadCallable( | ||
File fileToUpload, File logfile, CrashReportingPermissionManager permissionManager) { | ||
- this(fileToUpload, logfile, new MinidumpUploader(), permissionManager); | ||
+ this(fileToUpload, logfile, new org.chromium.components.minidump_uploader.BraveMinidumpUploader(), permissionManager); | ||
} | ||
|
||
public MinidumpUploadCallable(File fileToUpload, File logfile, |