diff --git a/ReactAndroid/Android-prebuilt.mk b/ReactAndroid/Android-prebuilt.mk index 394032a524ab95..3fd9edb409164b 100644 --- a/ReactAndroid/Android-prebuilt.mk +++ b/ReactAndroid/Android-prebuilt.mk @@ -40,8 +40,7 @@ LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libfolly_json.so LOCAL_EXPORT_C_INCLUDES := \ $(THIRD_PARTY_NDK_DIR)/boost/boost_1_63_0 \ $(THIRD_PARTY_NDK_DIR)/double-conversion \ - $(THIRD_PARTY_NDK_DIR)/folly \ - $(THIRD_PARTY_NDK_DIR)/glog/exported + $(THIRD_PARTY_NDK_DIR)/folly # Note: Sync with folly/Android.mk. FOLLY_FLAGS := \ -DFOLLY_NO_CONFIG=1 \ @@ -61,6 +60,14 @@ LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libfolly_futures.s LOCAL_SHARED_LIBRARIES := liblibfolly_json include $(PREBUILT_SHARED_LIBRARY) +# glog +include $(CLEAR_VARS) +LOCAL_MODULE := glog +LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libglog.so +LOCAL_EXPORT_C_INCLUDES := $(THIRD_PARTY_NDK_DIR)/glog/exported +LOCAL_SHARED_LIBRARIES := libglog +include $(PREBUILT_SHARED_LIBRARY) + # react_nativemodule_core include $(CLEAR_VARS) LOCAL_MODULE := react_nativemodule_core diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js index 8a35a0b506184e..2b263a046428a0 100644 --- a/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js +++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js @@ -203,8 +203,7 @@ function buildGetConstantsMethod( const rawProperties = methodTypeAnnotation.returnTypeAnnotation.properties || []; rawProperties.forEach(p => { - // TODO(T76712813): Should we push to optionalProps if the constant is nullable? - if (p.optional) { + if (p.optional || p.typeAnnotation.type === 'NullableTypeAnnotation') { optionalProps.push(p.name); } else { requiredProps.push(p.name);