Rename directories

Reviewed By: gkassabli

Differential Revision: D4284681

fbshipit-source-id: f0c6855c2c6e4389b7867f48f72cbb697830fc5a

Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj

@@ -337,14 +337,14 @@
 			containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 3D3C059A1DE3340900C268FA;
-			remoteInfo = CSSLayout;
+			remoteInfo = yoga;
 		};
 		3D3C08821DE3424E00C268FA /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 3D3C06751DE3340C00C268FA;
-			remoteInfo = "CSSLayout-tvOS";
+			remoteInfo = "yoga-tvOS";
 		};
 		58005BED1ABA80530062E044 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
@@ -726,8 +726,8 @@
 			children = (
 				14AADF041AC3DB95002390C9 /* libReact.a */,
 				2DD323D91DA2DD8B000FE1B8 /* libReact-tvOS.a */,
-				3D3C08811DE3424E00C268FA /* libCSSLayout.a */,
-				3D3C08831DE3424E00C268FA /* libCSSLayout-tvOS.a */,
+				3D3C08811DE3424E00C268FA /* libyoga.a */,
+				3D3C08831DE3424E00C268FA /* libyoga-tvOS.a */,
 				3D05748C1DE6008900184BB4 /* libcxxreact.a */,
 				3D05748E1DE6008900184BB4 /* libcxxreact-tvOS.a */,
 				3D0574901DE6008900184BB4 /* libjschelpers.a */,
@@ -1290,17 +1290,17 @@
 			remoteRef = 3D0574911DE6008900184BB4 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		3D3C08811DE3424E00C268FA /* libCSSLayout.a */ = {
+		3D3C08811DE3424E00C268FA /* libyoga.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
-			path = libCSSLayout.a;
+			path = libyoga.a;
 			remoteRef = 3D3C08801DE3424E00C268FA /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		3D3C08831DE3424E00C268FA /* libCSSLayout-tvOS.a */ = {
+		3D3C08831DE3424E00C268FA /* libyoga-tvOS.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
-			path = "libCSSLayout-tvOS.a";
+			path = "libyoga-tvOS.a";
 			remoteRef = 3D3C08821DE3424E00C268FA /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};

Libraries/Text/RCTTextManager.m

@@ -9,7 +9,7 @@
 
 #import "RCTTextManager.h"
 
-#import <CSSLayout/Yoga.h>
+#import <yoga/Yoga.h>
 #import <React/RCTAccessibilityManager.h>
 #import <React/RCTAssert.h>
 #import <React/RCTConvert.h>

React.podspec

@@ -31,10 +31,10 @@ Pod::Spec.new do |s|
   s.preserve_paths      = "cli.js", "Libraries/**/*.js", "lint", "linter.js", "node_modules", "package.json", "packager", "PATENTS", "react-native-cli"
 
   s.subspec 'Core' do |ss|
-    ss.dependency      'React/CSSLayout'
+    ss.dependency      'React/yoga'
     ss.dependency      'React/cxxreact'
     ss.source_files  = "React/**/*.{c,h,m,mm,S}"
-    ss.exclude_files = "**/__tests__/*", "IntegrationTests/* ReactCommon/CSSLayout/*"
+    ss.exclude_files = "**/__tests__/*", "IntegrationTests/* ReactCommon/yoga/*"
     ss.frameworks    = "JavaScriptCore"
     ss.libraries     = "stdc++"
   end
@@ -50,9 +50,9 @@ Pod::Spec.new do |s|
     ss.header_dir   = 'cxxreact'
   end
 
-  s.subspec 'CSSLayout' do |ss|
-    ss.source_files = 'ReactCommon/CSSLayout/**/*.{c,h}'
-    ss.header_dir   = 'CSSLayout'
+  s.subspec 'yoga' do |ss|
+    ss.source_files = 'ReactCommon/yoga/**/*.{c,h}'
+    ss.header_dir   = 'yoga'
   end
 
   s.subspec 'ART' do |ss|

React/Base/RCTConvert.h

@@ -10,7 +10,7 @@
 #import <QuartzCore/QuartzCore.h>
 #import <UIKit/UIKit.h>
 
-#import <CSSLayout/Yoga.h>
+#import <yoga/Yoga.h>
 #import <React/RCTAnimationType.h>
 #import <React/RCTBorderStyle.h>
 #import <React/RCTDefines.h>

React/Modules/RCTUIManager.m

@@ -11,7 +11,7 @@
 
 #import <AVFoundation/AVFoundation.h>
 
-#import <CSSLayout/Yoga.h>
+#import <yoga/Yoga.h>
 
 #import "RCTAccessibilityManager.h"
 #import "RCTAnimationType.h"

React/Views/RCTShadowView.h

@@ -9,7 +9,7 @@
 
 #import <UIKit/UIKit.h>
 
-#import <CSSLayout/Yoga.h>
+#import <yoga/Yoga.h>
 #import <React/RCTComponent.h>
 #import <React/RCTRootView.h>
 

ReactAndroid/DEFS

@@ -35,7 +35,7 @@ JSC_DEPS = [
   '//native/third-party/jsc:jsc_legacy_profiler',
 ]
 
-CSSLAYOUT_TARGET = '//ReactAndroid/src/main/java/com/facebook:csslayout'
+YOGA_TARGET = '//ReactAndroid/src/main/java/com/facebook:yoga'
 FBGLOGINIT_TARGET = '//ReactAndroid/src/main/jni/first-party/fbgloginit:fbgloginit'
 FBJNI_TARGET = '//ReactAndroid/src/main/jni/first-party/fb:jni'
 JNI_TARGET = '//ReactAndroid/src/main/jni/first-party/jni-hack:jni-hack'
@@ -103,14 +103,14 @@ def rn_robolectric_test(name, srcs, vm_args = None, *args, **kwargs):
                                                'buck-out/bin'))
 
   # RN tests use  Powermock, which means they get their own ClassLoaders.
-  # Because the csslayout native library (or any native library) can only be loaded into one
+  # Because the yoga native library (or any native library) can only be loaded into one
   # ClassLoader at a time, we need to run each in its own process, hence fork_mode = 'per_test'.
   robolectric_test(
     name = name,
     use_cxx_libraries = True,
     cxx_library_whitelist = [
-      '//ReactCommon/CSSLayout:CSSLayout',
-      '//ReactAndroid/src/main/jni/first-party/csslayoutjni:jni',
+      '//ReactCommon/yoga:yoga',
+      '//ReactAndroid/src/main/jni/first-party/yogajni:jni',
     ],
     fork_mode = 'per_test',
     srcs = srcs,

ReactAndroid/src/main/java/com/facebook/BUCK

@@ -1,8 +1,8 @@
 include_defs('//ReactAndroid/DEFS')
 
 android_library(
-  name = 'csslayout',
-  srcs = glob(['csslayout/*.java']),
+  name = 'yoga',
+  srcs = glob(['yoga/*.java']),
   deps = [
     react_native_dep('java/com/facebook/proguard/annotations:annotations'),
     react_native_dep('libraries/soloader/java/com/facebook/soloader:soloader'),
@@ -13,5 +13,5 @@ android_library(
 )
 
 project_config(
-  src_target = ':csslayout',
+  src_target = ':yoga',
 )

ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK

@@ -9,7 +9,7 @@ android_library(
     'layoutanimation/*.java'
   ]),
   deps = [
-    CSSLAYOUT_TARGET,
+    YOGA_TARGET,
     react_native_dep('java/com/facebook/systrace:systrace'),
     react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
     react_native_dep('third-party/android/support/v4:lib-support-v4'),

ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java

@@ -659,7 +659,7 @@ public void setMeasureFunction(YogaMeasureFunction measureFunction) {
     if ((measureFunction == null ^ mYogaNode.isMeasureDefined()) &&
         getChildCount() != 0) {
       throw new RuntimeException(
-        "Since a node with a measure function does not add any native CSSLayout children, it's " +
+        "Since a node with a measure function does not add any native yoga children, it's " +
           "not safe to transition to/from having a measure function unless a node has no children");
     }
     mYogaNode.setMeasureFunction(measureFunction);

ReactAndroid/src/main/java/com/facebook/react/views/art/BUCK

@@ -4,7 +4,7 @@ android_library(
   name = 'art',
   srcs = glob(['*.java']),
   deps = [
-    CSSLAYOUT_TARGET,
+    YOGA_TARGET,
     react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),
     react_native_target('java/com/facebook/react/bridge:bridge'),

ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK

@@ -4,7 +4,7 @@ android_library(
   name = 'drawer',
   srcs = glob(['**/*.java']),
   deps = [
-    CSSLAYOUT_TARGET,
+    YOGA_TARGET,
     react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
     react_native_dep('third-party/android/support/v4:lib-support-v4'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),

ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK

@@ -24,7 +24,7 @@ android_library(
     ':imageevents',
   ],
   deps = [
-    CSSLAYOUT_TARGET,
+    YOGA_TARGET,
     react_native_dep('libraries/fresco/fresco-react-native:fbcore'),
     react_native_dep('libraries/fresco/fresco-react-native:fresco-drawee'),
     react_native_dep('libraries/fresco/fresco-react-native:fresco-react-native'),

ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK

@@ -4,7 +4,7 @@ android_library(
   name = 'modal',
   srcs = glob(['*.java']),
   deps = [
-    CSSLAYOUT_TARGET,
+    YOGA_TARGET,
     react_native_dep('third-party/java/infer-annotations:infer-annotations'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),
     react_native_target('java/com/facebook/react/bridge:bridge'),

ReactAndroid/src/main/java/com/facebook/react/views/progressbar/BUCK

@@ -4,7 +4,7 @@ android_library(
   name = 'progressbar',
   srcs = glob(['*.java']),
   deps = [
-    CSSLAYOUT_TARGET,
+    YOGA_TARGET,
     react_native_dep('third-party/java/infer-annotations:infer-annotations'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),
     react_native_target('java/com/facebook/react/bridge:bridge'),

ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK

@@ -4,7 +4,7 @@ android_library(
   name = 'slider',
   srcs = glob(['*.java']),
   deps = [
-    CSSLAYOUT_TARGET,
+    YOGA_TARGET,
     react_native_dep('android_res/android/support/v7/appcompat-orig:res-for-react-native'),
     react_native_dep('third-party/android/support/v7/appcompat-orig:appcompat'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),

ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK

@@ -4,7 +4,7 @@ android_library(
   name = 'switchview',
   srcs = glob(['*.java']),
   deps = [
-    CSSLAYOUT_TARGET,
+    YOGA_TARGET,
     react_native_dep('third-party/android/support/v7/appcompat-orig:appcompat'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),
     react_native_target('java/com/facebook/react/bridge:bridge'),

ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK

@@ -4,7 +4,7 @@ android_library(
   name = 'text',
   srcs = glob(['*.java']),
   deps = [
-    CSSLAYOUT_TARGET,
+    YOGA_TARGET,
     react_native_dep('third-party/java/infer-annotations:infer-annotations'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),
     react_native_target('java/com/facebook/react/bridge:bridge'),

ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/BUCK

@@ -4,7 +4,7 @@ android_library(
   name = 'frescosupport',
   srcs = glob(['*.java']),
   deps = [
-    CSSLAYOUT_TARGET,
+    YOGA_TARGET,
     react_native_dep('libraries/fresco/fresco-react-native:fbcore'),
     react_native_dep('libraries/fresco/fresco-react-native:fresco-drawee'),
     react_native_dep('libraries/fresco/fresco-react-native:fresco-react-native'),

ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK

@@ -4,7 +4,7 @@ android_library(
   name = 'textinput',
   srcs = glob(['*.java']),
   deps = [
-    CSSLAYOUT_TARGET,
+    YOGA_TARGET,
     react_native_dep('third-party/java/infer-annotations:infer-annotations'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),
     react_native_target('java/com/facebook/react/bridge:bridge'),

ReactAndroid/src/main/java/com/facebook/react/views/toolbar/BUCK

@@ -4,7 +4,7 @@ android_library(
   name = 'toolbar',
   srcs = glob(['**/*.java']),
   deps = [
-    CSSLAYOUT_TARGET,
+    YOGA_TARGET,
     react_native_dep('android_res/android/support/v7/appcompat-orig:res-for-react-native'),
     react_native_dep('libraries/fresco/fresco-react-native:fresco-drawee'),
     react_native_dep('libraries/fresco/fresco-react-native:fresco-react-native'),

ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK

@@ -4,7 +4,7 @@ android_library(
   name = 'view',
   srcs = glob(['*.java']),
   deps = [
-    CSSLAYOUT_TARGET,
+    YOGA_TARGET,
     react_native_dep('third-party/java/infer-annotations:infer-annotations'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),
     react_native_target('java/com/facebook/react/bridge:bridge'),

ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java

@@ -42,7 +42,7 @@ void addView(View child, int index) {
       // We need to do that since {@link ViewPager} relies on layout passes to position those views
       // in a right way (also thanks to {@link ReactViewPagerManager#needsCustomLayoutForChildren}
       // returning {@code true}). Currently we only call {@link View#measure} and
-      // {@link View#layout} after CSSLayout step.
+      // {@link View#layout} after yoga step.
 
       // TODO(7323049): Remove this workaround once we figure out a way to re-layout some views on
       // request

ReactAndroid/src/main/jni/first-party/csslayoutjni/Android.mk → ReactAndroid/src/main/jni/first-party/yogajni/Android.mk

@@ -20,5 +20,5 @@ LOCAL_SHARED_LIBRARIES := libfb
 
 include $(BUILD_SHARED_LIBRARY)
 
-$(call import-module,CSSLayout)
+$(call import-module,yoga)
 $(call import-module,fb)

ReactAndroid/src/main/jni/first-party/csslayoutjni/BUCK → ReactAndroid/src/main/jni/first-party/yogajni/BUCK

@@ -16,7 +16,7 @@ if IS_OSS_BUILD:
       '-std=c++11',
     ],
     deps = [
-      '//ReactCommon/CSSLayout:CSSLayout',
+      '//ReactCommon/yoga:yoga',
       FBJNI_TARGET,
     ],
     visibility = ['PUBLIC'],

ReactAndroid/src/main/jni/first-party/csslayoutjni/jni/YGJNI.cpp → ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#include <CSSLayout/Yoga.h>
+#include <yoga/Yoga.h>
 #include <fb/fbjni.h>
 #include <iostream>
 

ReactAndroid/src/main/jni/xreact/jni/Android.mk

@@ -44,4 +44,4 @@ $(call import-module,jsc)
 $(call import-module,folly)
 $(call import-module,fbgloginit)
 $(call import-module,jsc)
-$(call import-module,csslayoutjni)
+$(call import-module,yogajni)

ReactAndroid/src/test/java/com/facebook/react/BUCK

@@ -6,7 +6,7 @@ rn_robolectric_test(
   contacts = ['oncall+fbandroid_sheriff@xmail.facebook.com'],
   srcs = glob(['*.java']),
   deps = [
-    CSSLAYOUT_TARGET,
+    YOGA_TARGET,
     react_native_dep('libraries/fbcore/src/test/java/com/facebook/powermock:powermock'),
     react_native_dep('third-party/java/fest:fest'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),

ReactAndroid/src/test/java/com/facebook/react/modules/BUCK

@@ -6,7 +6,7 @@ rn_robolectric_test(
   name = 'modules',
   srcs = glob(['**/*.java']),
   deps = [
-    CSSLAYOUT_TARGET,
+    YOGA_TARGET,
     react_native_dep('libraries/fbcore/src/test/java/com/facebook/powermock:powermock'),
     react_native_dep('third-party/java/fest:fest'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),

ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK

@@ -6,7 +6,7 @@ rn_robolectric_test(
   contacts = ['oncall+fbandroid_sheriff@xmail.facebook.com'],
   srcs = glob(['**/*.java']),
   deps = [
-    CSSLAYOUT_TARGET,
+    YOGA_TARGET,
     react_native_dep('libraries/fbcore/src/test/java/com/facebook/powermock:powermock'),
     react_native_dep('third-party/java/fest:fest'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),

ReactAndroid/src/test/java/com/facebook/react/views/BUCK

@@ -6,7 +6,7 @@ rn_robolectric_test(
   contacts = ['oncall+fbandroid_sheriff@xmail.facebook.com'],
   srcs = glob(['**/*.java']),
   deps = [
-    CSSLAYOUT_TARGET,
+    YOGA_TARGET,
     react_native_dep('libraries/fbcore/src/test/java/com/facebook/powermock:powermock'),
     react_native_dep('libraries/fresco/fresco-react-native:fresco-drawee'),
     react_native_dep('libraries/fresco/fresco-react-native:fresco-react-native'),

ReactCommon/CSSLayout/Android.mk → ReactCommon/yoga/Android.mk

@@ -5,8 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := yogacore
 
 LOCAL_SRC_FILES := \
-  CSSLayout/Yoga.c \
-  CSSLayout/YGNodeList.c
+  yoga/Yoga.c \
+  yoga/YGNodeList.c
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)