fbshipit-source-id: b14273e883aba6de7b817801a1b04e54a29a6366

android/build.gradle

@@ -121,11 +121,13 @@ android {
         buildConfigField "boolean", "IS_INTERNAL_BUILD", 'true'
         ndk {
             abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
+            stl 'c++_shared'
         }
 
         externalNativeBuild {
             cmake {
                 arguments '-DANDROID_TOOLCHAIN=clang'
+                arguments '-DANDROID_STL=c++_shared'
             }
         }
     }
@@ -163,7 +165,7 @@ android {
         implementation deps.okhttp3
         implementation 'com.facebook.litho:litho-core:0.15.0'
         implementation 'com.facebook.litho:litho-widget:0.15.0'
-        implementation fileTree(dir: 'plugins/console/dependencies', include: ['*.jar'])
+        implementation 'org.mozilla:rhino:1.7.10'
     }
 }
 

android/sample/build.gradle

@@ -40,7 +40,6 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    // ...
     // Litho
     implementation 'com.facebook.litho:litho-core:0.15.0'
     implementation 'com.facebook.litho:litho-widget:0.15.0'
@@ -59,5 +58,4 @@ dependencies {
 
     implementation 'com.squareup.okhttp3:okhttp:3.10.0'
     implementation project(':android')
-    //implementation project(':sonar')
 }