react-native-tvos 0.68.0-0 → 0.68.2-0

package/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm

@@ -309,41 +309,92 @@ using namespace facebook::react;
   return _props->isTVSelectable;
 }
 
-- (NSArray<id<UIFocusEnvironment>> *)preferredFocusEnvironments {
-  if (_nextFocusActiveTarget == nil) return [super preferredFocusEnvironments];
-  UIView * nextFocusActiveTarget = _nextFocusActiveTarget;
-  _nextFocusActiveTarget = nil;
-  NSArray<id<UIFocusEnvironment>> * focusEnvironment = @[nextFocusActiveTarget];
-  return focusEnvironment;
-}
-
-- (BOOL) shouldUpdateFocusInContext:(UIFocusUpdateContext *)context {
-  if (self.isFocused) {
-    if (_nextFocusUp != nil && context.focusHeading == UIFocusHeadingUp) {
-      self->_nextFocusActiveTarget = _nextFocusUp;
-      [self setNeedsFocusUpdate];
-      return false;
+// In tvOS, to support directional focus APIs, we add a UIFocusGuide for each
+// side of the view where a nextFocus has been set. Set layout constraints to
+// make the guide 1 px thick, and set the destination to the nextFocus object.
+//
+// This is only done once the view is focused.
+//
+- (void)enableDirectionalFocusGuides
+{
+  if (self->_nextFocusUp != nil) {
+    if (self.focusGuideUp == nil) {
+      self.focusGuideUp = [UIFocusGuide new];
+      [[self containingRootView] addLayoutGuide:self.focusGuideUp];
+
+      [self.focusGuideUp.bottomAnchor constraintEqualToAnchor:self.topAnchor].active = YES;
+      [self.focusGuideUp.widthAnchor constraintEqualToAnchor:self.widthAnchor].active = YES;
+      [self.focusGuideUp.heightAnchor constraintEqualToConstant:1.0].active = YES;
+      [self.focusGuideUp.leftAnchor constraintEqualToAnchor:self.leftAnchor].active = YES;
     }
-    if (_nextFocusDown != nil && context.focusHeading == UIFocusHeadingDown) {
-      self->_nextFocusActiveTarget = _nextFocusDown;
-      [self setNeedsFocusUpdate];
-      return false;
+
+    self.focusGuideUp.preferredFocusEnvironments = @[self->_nextFocusUp];
+  }
+
+  if (self->_nextFocusDown != nil) {
+    if (self.focusGuideDown == nil) {
+      self.focusGuideDown = [UIFocusGuide new];
+      [[self containingRootView] addLayoutGuide:self.focusGuideDown];
+
+      [self.focusGuideDown.topAnchor constraintEqualToAnchor:self.bottomAnchor].active = YES;
+      [self.focusGuideDown.widthAnchor constraintEqualToAnchor:self.widthAnchor].active = YES;
+      [self.focusGuideDown.heightAnchor constraintEqualToConstant:1.0].active = YES;
+      [self.focusGuideDown.leftAnchor constraintEqualToAnchor:self.leftAnchor].active = YES;
     }
-    if (_nextFocusLeft != nil && context.focusHeading == UIFocusHeadingLeft) {
-      self->_nextFocusActiveTarget = _nextFocusLeft;
-      [self setNeedsFocusUpdate];
-      return false;
+
+    self.focusGuideDown.preferredFocusEnvironments = @[self->_nextFocusDown];
+  }
+
+  if (self->_nextFocusLeft != nil) {
+    if (self.focusGuideLeft == nil) {
+      self.focusGuideLeft = [UIFocusGuide new];
+      [[self containingRootView] addLayoutGuide:self.focusGuideLeft];
+
+      [self.focusGuideLeft.topAnchor constraintEqualToAnchor:self.topAnchor].active = YES;
+      [self.focusGuideLeft.widthAnchor constraintEqualToConstant:1.0].active = YES;
+      [self.focusGuideLeft.heightAnchor constraintEqualToAnchor:self.heightAnchor].active = YES;
+      [self.focusGuideLeft.rightAnchor constraintEqualToAnchor:self.leftAnchor].active = YES;
     }
-    if (_nextFocusRight != nil && context.focusHeading == UIFocusHeadingRight) {
-      self->_nextFocusActiveTarget = _nextFocusRight;
-      [self setNeedsFocusUpdate];
-      return false;
+
+    self.focusGuideLeft.preferredFocusEnvironments = @[self->_nextFocusLeft];
+  }
+
+  if (self->_nextFocusRight != nil) {
+    if (self.focusGuideRight == nil) {
+      self.focusGuideRight = [UIFocusGuide new];
+      [[self containingRootView] addLayoutGuide:self.focusGuideRight];
+
+      [self.focusGuideRight.topAnchor constraintEqualToAnchor:self.topAnchor].active = YES;
+      [self.focusGuideRight.widthAnchor constraintEqualToConstant:1.0].active = YES;
+      [self.focusGuideRight.heightAnchor constraintEqualToAnchor:self.heightAnchor].active = YES;
+      [self.focusGuideRight.leftAnchor constraintEqualToAnchor:self.rightAnchor].active = YES;
     }
-    self->_nextFocusActiveTarget = nil;
-    return true;
+
+    self.focusGuideRight.preferredFocusEnvironments = @[self->_nextFocusRight];
+  }
+}
+// Called when focus leaves this view -- disable the directional focus guides
+// (if they exist) so that they don't interfere with focus navigation from
+// other views
+//
+- (void)disableDirectionalFocusGuides
+{
+  if (self.focusGuideUp != nil) {
+    [[self containingRootView] removeLayoutGuide:self.focusGuideUp];
+    self.focusGuideUp = nil;
+  }
+  if (self.focusGuideDown != nil) {
+    [[self containingRootView] removeLayoutGuide:self.focusGuideDown];
+    self.focusGuideDown = nil;
+  }
+  if (self.focusGuideLeft != nil) {
+    [[self containingRootView] removeLayoutGuide:self.focusGuideLeft];
+    self.focusGuideLeft = nil;
+  }
+  if (self.focusGuideRight != nil) {
+    [[self containingRootView] removeLayoutGuide:self.focusGuideRight];
+    self.focusGuideRight = nil;
   }
-  self->_nextFocusActiveTarget = nil;
-  return true;
 }
 
 - (void)didUpdateFocusInContext:(UIFocusUpdateContext *)context withAnimationCoordinator:(UIFocusAnimationCoordinator *)coordinator
@@ -353,11 +404,13 @@ using namespace facebook::react;
     }
     if (context.nextFocusedView == self && self.isUserInteractionEnabled ) {
       [self becomeFirstResponder];
+      [self enableDirectionalFocusGuides];
       [coordinator addCoordinatedAnimations:^(void){
           [self addParallaxMotionEffects];
           [self sendFocusNotification:context];
       } completion:^(void){}];
     } else {
+      [self disableDirectionalFocusGuides];
       [coordinator addCoordinatedAnimations:^(void){
           [self removeParallaxMotionEffects];
           [self sendBlurNotification:context];

package/React/Modules/RCTTVMenuBridge.m

@@ -24,4 +24,16 @@ RCT_EXPORT_METHOD(disableTVMenuKey)
     [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVDisableMenuKeyNotification object:nil];
 }
 
+RCT_EXPORT_METHOD(enableTVPanGesture)
+{
+    [RCTTVRemoteHandler setUsePanGesture:YES];
+    [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVEnablePanGestureNotification object:nil];
+}
+
+RCT_EXPORT_METHOD(disableTVPanGesture)
+{
+    [RCTTVRemoteHandler setUsePanGesture:NO];
+    [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVDisablePanGestureNotification object:nil];
+}
+
 @end

package/React/Views/RCTTVView.h

@@ -32,11 +32,15 @@
 /**
  * Focus direction tags
  */
-@property (nonatomic, strong) RCTTVView * nextFocusUp;
-@property (nonatomic, strong) RCTTVView * nextFocusDown;
-@property (nonatomic, strong) RCTTVView * nextFocusLeft;
-@property (nonatomic, strong) RCTTVView * nextFocusRight;
-@property (nonatomic, strong) RCTTVView * nextFocusActiveTarget;
+@property (nonatomic, weak) RCTTVView * nextFocusUp;
+@property (nonatomic, weak) RCTTVView * nextFocusDown;
+@property (nonatomic, weak) RCTTVView * nextFocusLeft;
+@property (nonatomic, weak) RCTTVView * nextFocusRight;
+
+@property (nonatomic, strong) UIFocusGuide * focusGuideUp;
+@property (nonatomic, strong) UIFocusGuide * focusGuideDown;
+@property (nonatomic, strong) UIFocusGuide * focusGuideLeft;
+@property (nonatomic, strong) UIFocusGuide * focusGuideRight;
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge;
 

package/React/Views/RCTTVView.m

@@ -127,6 +127,18 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : unused)
   return (self.isTVSelectable);
 }
 
+- (RCTRootView *)rootView
+{
+  UIView *rootview = self;
+  while (![rootview isReactRootView] && rootview != nil) {
+    rootview = [rootview superview];
+  }
+  if (rootview == nil) return nil;
+
+  rootview = [rootview superview];
+  return (RCTRootView *)rootview;
+}
+
 - (void)addParallaxMotionEffects
 {
   if(![self.tvParallaxProperties[@"enabled"] boolValue]) {
@@ -237,11 +249,13 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : unused)
   }
   if (context.nextFocusedView == self && self.isTVSelectable ) {
     [self becomeFirstResponder];
+    [self enableDirectionalFocusGuides];
     [coordinator addCoordinatedAnimations:^(void){
       [self addParallaxMotionEffects];
       [self sendFocusNotification:context];
     } completion:^(void){}];
   } else {
+    [self disableDirectionalFocusGuides];
     [coordinator addCoordinatedAnimations:^(void){
       [self sendBlurNotification:context];
       [self removeParallaxMotionEffects];
@@ -250,41 +264,93 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : unused)
   }
 }
 
-- (BOOL) shouldUpdateFocusInContext:(UIFocusUpdateContext *)context {
-  if (self.isFocused) {
-    if (_nextFocusUp != nil && context.focusHeading == UIFocusHeadingUp) {
-      self->_nextFocusActiveTarget = _nextFocusUp;
-      [self setNeedsFocusUpdate];
-      return false;
+// In tvOS, to support directional focus APIs, we add a UIFocusGuide for each
+// side of the view where a nextFocus has been set. Set layout constraints to
+// make the guide 1 px thick, and set the destination to the nextFocus object.
+//
+// This is only done once the view is focused.
+//
+- (void)enableDirectionalFocusGuides
+{
+  if (self->_nextFocusUp != nil) {
+    if (self.focusGuideUp == nil) {
+      self.focusGuideUp = [UIFocusGuide new];
+      [[self rootView]  addLayoutGuide:self.focusGuideUp];
+
+      [self.focusGuideUp.bottomAnchor constraintEqualToAnchor:self.topAnchor].active = YES;
+      [self.focusGuideUp.widthAnchor constraintEqualToAnchor:self.widthAnchor].active = YES;
+      [self.focusGuideUp.heightAnchor constraintEqualToConstant:1.0].active = YES;
+      [self.focusGuideUp.leftAnchor constraintEqualToAnchor:self.leftAnchor].active = YES;
     }
-    if (_nextFocusDown != nil && context.focusHeading == UIFocusHeadingDown) {
-      self->_nextFocusActiveTarget = _nextFocusDown;
-      [self setNeedsFocusUpdate];
-      return false;
+
+    self.focusGuideUp.preferredFocusEnvironments = @[self->_nextFocusUp];
+  }
+
+  if (self->_nextFocusDown != nil) {
+    if (self.focusGuideDown == nil) {
+      self.focusGuideDown = [UIFocusGuide new];
+      [[self rootView]  addLayoutGuide:self.focusGuideDown];
+
+      [self.focusGuideDown.topAnchor constraintEqualToAnchor:self.bottomAnchor].active = YES;
+      [self.focusGuideDown.widthAnchor constraintEqualToAnchor:self.widthAnchor].active = YES;
+      [self.focusGuideDown.heightAnchor constraintEqualToConstant:1.0].active = YES;
+      [self.focusGuideDown.leftAnchor constraintEqualToAnchor:self.leftAnchor].active = YES;
     }
-    if (_nextFocusLeft != nil && context.focusHeading == UIFocusHeadingLeft) {
-      self->_nextFocusActiveTarget = _nextFocusLeft;
-      [self setNeedsFocusUpdate];
-      return false;
+
+    self.focusGuideDown.preferredFocusEnvironments = @[self->_nextFocusDown];
+  }
+
+  if (self->_nextFocusLeft != nil) {
+    if (self.focusGuideLeft == nil) {
+      self.focusGuideLeft = [UIFocusGuide new];
+      [[self rootView]  addLayoutGuide:self.focusGuideLeft];
+
+      [self.focusGuideLeft.topAnchor constraintEqualToAnchor:self.topAnchor].active = YES;
+      [self.focusGuideLeft.widthAnchor constraintEqualToConstant:1.0].active = YES;
+      [self.focusGuideLeft.heightAnchor constraintEqualToAnchor:self.heightAnchor].active = YES;
+      [self.focusGuideLeft.rightAnchor constraintEqualToAnchor:self.leftAnchor].active = YES;
     }
-    if (_nextFocusRight != nil && context.focusHeading == UIFocusHeadingRight) {
-      self->_nextFocusActiveTarget = _nextFocusRight;
-      [self setNeedsFocusUpdate];
-      return false;
+
+    self.focusGuideLeft.preferredFocusEnvironments = @[self->_nextFocusLeft];
+  }
+
+  if (self->_nextFocusRight != nil) {
+    if (self.focusGuideRight == nil) {
+      self.focusGuideRight = [UIFocusGuide new];
+      [[self rootView] addLayoutGuide:self.focusGuideRight];
+
+      [self.focusGuideRight.topAnchor constraintEqualToAnchor:self.topAnchor].active = YES;
+      [self.focusGuideRight.widthAnchor constraintEqualToConstant:1.0].active = YES;
+      [self.focusGuideRight.heightAnchor constraintEqualToAnchor:self.heightAnchor].active = YES;
+      [self.focusGuideRight.leftAnchor constraintEqualToAnchor:self.rightAnchor].active = YES;
     }
-    self->_nextFocusActiveTarget = nil;
-    return true;
+
+    self.focusGuideRight.preferredFocusEnvironments = @[self->_nextFocusRight];
   }
-  self->_nextFocusActiveTarget = nil;
-  return true;
 }
 
-- (NSArray<id<UIFocusEnvironment>> *)preferredFocusEnvironments {
-  if (_nextFocusActiveTarget == nil) return [super preferredFocusEnvironments];
-  RCTTVView * nextFocusActiveTarget = _nextFocusActiveTarget;
-  _nextFocusActiveTarget = nil;
-  NSArray<id<UIFocusEnvironment>> * focusEnvironment = @[nextFocusActiveTarget];
-  return focusEnvironment;
+// Called when focus leaves this view -- disable the directional focus guides
+// (if they exist) so that they don't interfere with focus navigation from
+// other views
+//
+- (void)disableDirectionalFocusGuides
+{
+  if (self.focusGuideUp != nil) {
+    [[self rootView] removeLayoutGuide:self.focusGuideUp];
+    self.focusGuideUp = nil;
+  }
+  if (self.focusGuideDown != nil) {
+    [[self rootView] removeLayoutGuide:self.focusGuideDown];
+    self.focusGuideDown = nil;
+  }
+  if (self.focusGuideLeft != nil) {
+    [[self rootView] removeLayoutGuide:self.focusGuideLeft];
+    self.focusGuideLeft = nil;
+  }
+  if (self.focusGuideRight != nil) {
+    [[self rootView] removeLayoutGuide:self.focusGuideRight];
+    self.focusGuideRight = nil;
+  }
 }
 
 - (void)sendFocusNotification:(__unused UIFocusUpdateContext *)context
@@ -339,15 +405,11 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : unused)
   _hasTVPreferredFocus = hasTVPreferredFocus;
   if (hasTVPreferredFocus) {
     dispatch_async(dispatch_get_main_queue(), ^{
-      UIView *rootview = self;
-      while (![rootview isReactRootView] && rootview != nil) {
-        rootview = [rootview superview];
-      }
-      if (rootview == nil) return;
+      RCTRootView *rootview = [self rootView];
       
-      rootview = [rootview superview];
+      if (rootview == nil) return;
       
-      [(RCTRootView *)rootview setReactPreferredFocusedView:self];
+      [rootview setReactPreferredFocusedView:self];
       [rootview setNeedsFocusUpdate];
       [rootview updateFocusIfNeeded];
     });
@@ -356,23 +418,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : unused)
 
 - (void)setHasTVPreferredFocus:(BOOL)hasTVPreferredFocus
 {
-  _hasTVPreferredFocus = hasTVPreferredFocus;
-  if (hasTVPreferredFocus) {
-    dispatch_async(dispatch_get_main_queue(), ^{
-      UIView *rootview = self;
-      while (![rootview isReactRootView] && rootview != nil) {
-        rootview = [rootview superview];
-      }
-      if (rootview == nil)
-        return;
-      
-      rootview = [rootview superview];
-      
-      [(RCTRootView *)rootview setReactPreferredFocusedView:self];
-      [rootview setNeedsFocusUpdate];
-      [rootview updateFocusIfNeeded];
-    });
-  }
+  [self setPreferredFocus:hasTVPreferredFocus];
 }
 
 - (void)addFocusGuide:(NSArray*)destinations {

package/ReactAndroid/build.gradle

@@ -292,10 +292,13 @@ task androidSourcesJar(type: Jar) {
 android {
     compileSdkVersion 31
 
-    // Used to override the NDK path & version on internal CI
-    if (System.getenv("ANDROID_NDK") != null && System.getenv("LOCAL_ANDROID_NDK_VERSION") != null) {
-        ndkPath System.getenv("ANDROID_NDK")
-        ndkVersion System.getenv("LOCAL_ANDROID_NDK_VERSION")
+    // Used to override the NDK path/version on internal CI or by allowing
+    // users to customize the NDK path/version from their root project (e.g. for M1 support)
+    if (rootProject.hasProperty("ndkPath")) {
+        ndkPath rootProject.ext.ndkPath
+    }
+    if (rootProject.hasProperty("ndkVersion")) {
+        ndkVersion rootProject.ext.ndkVersion
     }
 
     defaultConfig {
@@ -329,6 +332,11 @@ android {
                     // This flag will suppress "fcntl(): Bad file descriptor" warnings on local builds.
                     arguments "--output-sync=none"
                 }
+
+                // Fix for windows limit on number of character in file paths and in command lines
+                if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+                    arguments "NDK_APP_SHORT_COMMANDS=true"
+                }
             }
         }
         ndk {

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.68.0-0
+VERSION_NAME=0.68.2-0
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative

package/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/Android.mk

@@ -13,6 +13,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := jsijniprofiler
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
 

package/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk

@@ -12,6 +12,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := hermes-executor-release
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
 
@@ -35,6 +36,7 @@ LOCAL_MODULE := hermes-executor-debug
 LOCAL_CFLAGS := -DHERMES_ENABLE_DEBUGGER=1
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
 

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := mapbufferjni
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/react/common/mapbuffer/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
   libfb \

package/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := fabricjni
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
   libbutter \

package/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := jscexecutor
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 

package/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := reactnativeblob
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java

@@ -17,6 +17,6 @@ public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
       "minor", 68,
-      "patch", 0,
+      "patch", 1,
       "prerelease", null);
 }

package/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/Android.mk

@@ -26,6 +26,7 @@ LOCAL_MODULE := reactperfloggerjni
 
 # Compile all local c++ files
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/reactperflogger/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 # Build the files in this directory as a shared library
 include $(BUILD_SHARED_LIBRARY)

package/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk

@@ -28,6 +28,7 @@ LOCAL_MODULE := callinvokerholder
 
 # Compile all local c++ files
 LOCAL_SRC_FILES := $(LOCAL_PATH)/ReactCommon/CallInvokerHolder.cpp
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 # Build the files in this directory as a shared library
 include $(BUILD_STATIC_LIBRARY)
@@ -56,6 +57,7 @@ LOCAL_STATIC_LIBRARIES = libcallinvokerholder libreactperfloggerjni
 
 # Compile all local c++ files
 LOCAL_SRC_FILES := $(LOCAL_PATH)/ReactCommon/TurboModuleManager.cpp $(LOCAL_PATH)/ReactCommon/OnLoad.cpp
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 # Build the files in this directory as a shared library
 include $(BUILD_SHARED_LIBRARY)

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := uimanagerjni
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
   libfb \

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

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := yoga
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/jni/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/jni
 

package/ReactAndroid/src/main/jni/react/jni/Android.mk

@@ -47,6 +47,7 @@ LOCAL_MODULE := reactnativeutilsjni
 
 # Compile all local c++ files.
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 ifeq ($(APP_OPTIM),debug)
   # Keep symbols by overriding the strip command invoked by ndk-build.
@@ -106,6 +107,7 @@ LOCAL_MODULE := reactnativejni
 
 # Compile all local c++ files.
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 ifeq ($(APP_OPTIM),debug)
   # Keep symbols by overriding the strip command invoked by ndk-build.

package/ReactAndroid/src/main/jni/third-party/boost/Android.mk

@@ -5,6 +5,7 @@ include $(CLEAR_VARS)
 # because the react native version does not include anything outside of headers.
 # They are required for Folly futures to compile successfully.
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/asm/$(TARGET_ARCH)/*.S)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0

package/ReactCommon/butter/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := butter
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/

package/ReactCommon/cxxreact/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := reactnative
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -17,7 +17,7 @@ namespace facebook::react {
 constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 68;
-  int32_t Patch = 0;
+  int32_t Patch = 1;
   std::string_view Prerelease = "";
 } ReactNativeVersion;
 

package/ReactCommon/hermes/executor/Android.mk

@@ -12,6 +12,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := hermes-executor-common-release
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
@@ -27,6 +28,7 @@ LOCAL_MODULE := hermes-executor-common-debug
 LOCAL_CFLAGS := -DHERMES_ENABLE_DEBUGGER=1
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)

package/ReactCommon/hermes/inspector/Android.mk

@@ -12,6 +12,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := hermes-inspector
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/detail/*.cpp $(LOCAL_PATH)/chrome/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_ROOT := $(LOCAL_PATH)/../..
 

package/ReactCommon/hermes/inspector/tools/msggen/yarn.lock

@@ -1502,9 +1502,9 @@ ansi-escapes@^4.2.1:
     type-fest "^0.21.3"
 
 ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
+  integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
 
 ansi-regex@^5.0.0:
   version "5.0.0"
@@ -4152,9 +4152,9 @@ minimatch@^3.0.4:
     brace-expansion "^1.1.7"
 
 minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
 mississippi@^3.0.0:
   version "3.0.0"

package/ReactCommon/jsi/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := jsi
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/jsi/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
@@ -25,6 +26,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := jscruntime
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)