Make fbsource and GitHub consistent

NickGerleman · Feb 26, 2016 · 9d3d9df · 9d3d9df
1 parent 652c1c1
commit 9d3d9df
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 15 deletions.
diff --git a/Libraries/Animated/examples/pic1.jpg b/Libraries/Animated/examples/pic1.jpg
diff --git a/Libraries/Animated/examples/pic2.jpg b/Libraries/Animated/examples/pic2.jpg
diff --git a/Libraries/Animated/examples/pic3.jpg b/Libraries/Animated/examples/pic3.jpg
diff --git a/ReactAndroid/src/main/jni/react/BUCK b/ReactAndroid/src/main/jni/react/BUCK
@@ -22,14 +22,27 @@ def react_library(**kwargs):
     visibility = [
       react_native_target('jni/react/jni:jni'),
     ],
-    deps = DEPS + [
-      '//native/third-party/jsc:jsc',
-      '//native/third-party/jsc:jsc_legacy_profiler',
-    ],
+    deps = DEPS + JSC_DEPS,
     preprocessor_flags = PREPROCESSOR_FLAGS,
     **kwargs
   )
 
+  cxx_library(
+    name = 'react-internal',
+    visibility = [
+      react_native_target('jni/react/jni:jni-internal'),
+    ],
+    deps = DEPS + JSC_INTERNAL_DEPS,
+    preprocessor_flags = PREPROCESSOR_FLAGS + [
+      '-DWITH_FB_JSC_TUNING=1',
+      '-DWITH_JSC_MEMORY_PRESSURE=1',
+      '-DWITH_FBJSCEXTENSIONS=1',
+      '-DWITH_JSC_INTERNAL=1',
+      '-DWITH_FB_MEMORY_PROFILING=1',
+    ],
+    **kwargs
+  )
+
 react_library(
   soname = 'libreactnative.so',
   header_namespace = 'react',
@@ -44,7 +57,6 @@ react_library(
     'JSCTracing.cpp',
     'JSCMemory.cpp',
     'JSCLegacyProfiler.cpp',
-    'JSCWebWorker.cpp',
     'Platform.cpp',
   ],
   headers = [
@@ -58,7 +70,6 @@ react_library(
     'Executor.h',
     'JSCExecutor.h',
     'JSCHelpers.h',
-    'JSCWebWorker.h',
     'MessageQueueThread.h',
     'MethodCall.h',
     'JSModulesUnbundle.h',

diff --git a/ReactAndroid/src/main/jni/react/jni/BUCK b/ReactAndroid/src/main/jni/react/jni/BUCK
@@ -15,10 +15,17 @@ def jni_library(**kwargs):
     visibility = [
       'PUBLIC',
     ],
-    deps = DEPS + [
+    deps = DEPS + JSC_DEPS + [
       react_native_target('jni/react:react'),
-      '//native/third-party/jsc:jsc',
-      '//native/third-party/jsc:jsc_legacy_profiler',
+    ],
+    **kwargs
+  )
+
+  cxx_library(
+    name='jni-internal',
+    visibility = [INTERNAL_APP],
+    deps = DEPS + JSC_INTERNAL_DEPS + [
+      react_native_target('jni/react:react-internal'),
     ],
     **kwargs
   )

diff --git a/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK b/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK
@@ -1,11 +1,11 @@
 android_prebuilt_aar(
-  name = 'appcompat',
-  aar = ':appcompat-binary-aar',
-  visibility = ['//ReactAndroid/...',],
+    name = 'appcompat-23.1',
+    aar = ':appcompat-binary-aar',
+    visibility = ['//ReactAndroid/...',],
 )
 
 remote_file(
-  name = 'appcompat-binary-aar',
-  url = 'mvn:com.android.support:appcompat-v7:aar:23.0.1',
-  sha1 = '7d659f671541394a8bc2b9f909950aa2a5ec87ff',
+    name = 'appcompat-binary-aar',
+    url = 'mvn:com.android.support:appcompat-v7:aar:23.0.1',
+    sha1 = '7d659f671541394a8bc2b9f909950aa2a5ec87ff',
 )