Droid cleanups (#247)

* Some cleanup to take our fork closer to FB repo

* More cleanups.. Cleaning up the docker file and the changes in the setup
bash script. We no longer run the docker based test in our PR/publish.
They are no longer kept in the FB reporitory as well.

* Cleaning up the unused code snippets in RNTester

* Clearing some more devmain build files.

Author: mganandraj

ContainerShip/scripts/CleanUpDocker.bat

@@ -68,7 +68,7 @@ project.ext.react = [
     bundleAssetName: "RNTesterApp.android.bundle",
     entryFile: file("../../js/RNTesterApp.android.js"),
     root: "$rootDir",
-    inputExcludes: ["android/**", "./**", ".gradle/**"],
+    inputExcludes: ["android/**", "./**", ".gradle/**"]
 ]
 
 apply from: "../../../react.gradle"
@@ -138,24 +138,11 @@ android {
             signingConfig signingConfigs.release
         }
     }
-    packagingOptions {
-        pickFirst '**/armeabi-v7a/libc++_shared.so'
-        pickFirst '**/x86/libc++_shared.so'
-        pickFirst '**/x86_64/libc++_shared.so'
-        pickFirst '**/arm64-v8a/libc++_shared.so'
-    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-
-    // Build React Native from source
-    if (isSDXPlatform()) {
-        implementation project(':react-native:ReactAndroid')
-    }
-    else {
-        implementation project(':ReactAndroid')
-    }
+    implementation project(':ReactAndroid')
 
     if (useIntlJsc) {
         implementation 'org.webkit:android-jsc-intl:+'

ContainerShip/scripts/run-android-docker-instrumentation-specific-tests.bat

@@ -9,17 +9,9 @@
 package com.facebook.react.uiapp;
 
 import android.os.Bundle;
-import android.system.ErrnoException;
-import android.system.Os;
-import android.util.Log;
 
 import com.facebook.react.ReactActivity;
 import com.facebook.react.ReactActivityDelegate;
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.bridge.CatalystInstance;
-import com.facebook.react.bridge.ReactContext;
-
-import java.io.File;
 
 import javax.annotation.Nullable;
 

RNTester/android/app/build.gradle

@@ -9,48 +9,19 @@
 package com.facebook.react.uiapp;
 
 import android.app.Application;
-import android.content.Context;
-import android.util.Log;
 
 import com.facebook.react.BuildConfig;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
-import com.facebook.react.bridge.JavaScriptExecutorFactory;
-import com.facebook.react.bridge.ReactMarker;
-import com.facebook.react.bridge.ReactMarkerConstants;
 import com.facebook.react.shell.MainReactPackage;
-import com.facebook.react.v8executor.V8ExecutorFactory;
 import com.facebook.react.views.text.ReactFontManager;
 
-
-import java.io.File;
 import java.util.Arrays;
 import java.util.List;
 
-
-import static com.facebook.react.modules.systeminfo.AndroidInfoHelpers.getFriendlyDeviceName;
-
 public class RNTesterApplication extends Application implements ReactApplication {
- private static final String JSE_CACHING_DIRECTORY_NAME = "cache";
-
-  static class RNTesterReactMarker implements ReactMarker.MarkerListener {
-    final private static String LOG_TAG = "RNTesterReactMarker";
-
-    @Override
-    public void logMarker(final ReactMarkerConstants name, final String tag, final int instanceKey) {
-      StringBuilder builder = new StringBuilder();
-      String markerName = name.toString();
-      builder.append(" Marker: ").append(markerName);
-      if (tag != null) {
-        builder.append(" Tag: ").append(tag);
-      }
-      Log.i(LOG_TAG, builder.toString());
-    }
-  }
-
- private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
-
+  private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
     @Override
     public String getJSMainModuleName() {
       return "RNTester/js/RNTesterApp.android";

RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java

@@ -345,14 +345,7 @@ android {
 }
 
 dependencies {
-    if (System.getenv("BUCK_BUILD") != "1") {
-        if (isSDXPlatform()) {
-            annotationProcessor project(':react-native:processor');
-        }
-        else {
-            annotationProcessor project(':processor');
-        }
-    }
+    annotationProcessor project(':processor');
     api("com.facebook.infer.annotation:infer-annotation:0.11.2")
     api("javax.inject:javax.inject:1")
     api("androidx.appcompat:appcompat:1.0.2")

RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java

@@ -18,15 +18,6 @@ buildscript {
     }
 }
 
-def isSDXPlatform() {
-    if (parent == null) {
-        return false;
-    }
-
-    return true;
-}
-
-
 allprojects {
     repositories {
         maven {
@@ -36,4 +27,4 @@ allprojects {
         google()
         jcenter()
     }
-}
+}