diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags index b7e9f72db09..dfc8f4d80c8 100644 --- a/android/java/apk_for_test.flags +++ b/android/java/apk_for_test.flags @@ -136,15 +136,6 @@ *** mTabModelProfileSupplier; } --keep class org.chromium.chrome.browser.ChromeTabbedActivity { - *** hideOverview(...); -} - --keep class org.chromium.chrome.browser.app.BraveActivity { - *** openNewOrSelectExistingTab(...); - *** selectExistingTab(...); -} - -keep class org.chromium.chrome.browser.tabbed_mode.TabbedRootUiCoordinator { public (...); } @@ -194,13 +185,6 @@ *** getMaxRowsForMostVisitedTiles(...); } --keep class org.chromium.chrome.browser.toolbar.top.BraveToolbarLayout { - *** updateModernLocationBarColorImpl(...); - *** onClickImpl(...); - *** populateUrlAnimatorSet(...); - *** getBoundsAfterAccountingForRightButtons(...); -} - -keep class org.chromium.chrome.browser.password_manager.settings.PasswordSettings { public (...); } diff --git a/android/java/org/chromium/base/BraveReflectionUtil.java b/android/java/org/chromium/base/BraveReflectionUtil.java index 478f881947c..3dd813da17b 100644 --- a/android/java/org/chromium/base/BraveReflectionUtil.java +++ b/android/java/org/chromium/base/BraveReflectionUtil.java @@ -14,9 +14,9 @@ import java.lang.reflect.Method; public class BraveReflectionUtil { private static String TAG = "BraveReflectionUtil"; - // For each method invocation add appropriate test to - // 'brave/android/javatests/org/chromium/chrome/browser/BytecodeTest.java' with checking - // parameter types. + // NOTE: For each method for invocation add appropriate test to `testMethodsForInvocationExist` + // method in 'brave/android/javatests/org/chromium/chrome/browser/BytecodeTest.java' file with + // checking parameter types. public static Object InvokeMethod( Class methodOwner, Object obj, String method, Object... typesAndArgs) { try { diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 05f43ff734f..9453c1d95b0 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -196,6 +196,10 @@ public class BytecodeTest { List.class)); Assert.assertTrue(methodExists("org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout", "getBoundsAfterAccountingForRightButtons", true, int.class, ViewGroup.class)); + + // NOTE: Add new checks above. For each new check in this method add proguard exception in + // `brave/android/java/proguard.flags` file under `Add methods for invocation below` + // section. Both test and regular apks should have the same exceptions. } @Test diff --git a/test/BUILD.gn b/test/BUILD.gn index 1d8ae26cc3d..db2fe6f2cc8 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -872,7 +872,10 @@ if (is_android) { shared_libraries = [ "//chrome/android:libchromefortest" ] if (!is_java_debug) { proguard_enabled = true - proguard_configs = [ "//brave/android/java/apk_for_test.flags" ] + proguard_configs = [ + "//brave/android/java/proguard.flags", + "//brave/android/java/apk_for_test.flags", + ] } sources = [