diff --git a/android/build.gradle b/android/build.gradle
index 92f11a0f5..d1fa06e66 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -139,6 +139,9 @@ android {
                 srcDir 'android'
                 srcDir 'core'
                 srcDir 'plugins'
+                exclude 'console/ConsoleSonarPlugin.java'
+                exclude 'console/JavascriptEnvironment.java'
+                exclude 'console/JavascriptSession.java'
             }
             res {
                 srcDir 'res'
diff --git a/android/res/values/ids.xml b/android/res/values/ids.xml
new file mode 100644
index 000000000..6d454c931
--- /dev/null
+++ b/android/res/values/ids.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <item type="id" name="sonar_skip_view_traversal"/>
+</resources>
diff --git a/libs/fbjni/src/main/java/com/facebook/jni/HybridClassBase.java b/libs/fbjni/src/main/java/com/facebook/jni/HybridClassBase.java
new file mode 100644
index 000000000..3e39175c4
--- /dev/null
+++ b/libs/fbjni/src/main/java/com/facebook/jni/HybridClassBase.java
@@ -0,0 +1,11 @@
+// Copyright (c) 2004-present, Facebook, Inc.
+
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
+
+package com.facebook.jni;
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public abstract class HybridClassBase extends HybridData {
+}