From b97619e0aaf5343446fc11b8a22a3a516cefdfcd Mon Sep 17 00:00:00 2001 From: David Vacca Date: Wed, 5 Aug 2020 23:59:46 -0700 Subject: [PATCH] Make graphics module to compile in OSS Summary: This diff creates the Android.mk file for the fabric graphics module This is necessary to enable fabric in RN OSS changelog: [internal] internal Reviewed By: fkgozali Differential Revision: D22908219 fbshipit-source-id: 70ef1d06053b0ca07a71c0a2d36e4edd617b2a25 --- ReactAndroid/src/main/jni/react/jni/Android.mk | 3 ++- ReactCommon/react/renderer/graphics/Android.mk | 16 ++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ReactAndroid/src/main/jni/react/jni/Android.mk b/ReactAndroid/src/main/jni/react/jni/Android.mk index 1288f3f646e..ba84704a6b7 100644 --- a/ReactAndroid/src/main/jni/react/jni/Android.mk +++ b/ReactAndroid/src/main/jni/react/jni/Android.mk @@ -22,7 +22,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -Wno-unused-lambda-capture LOCAL_LDLIBS += -landroid # The dynamic libraries (.so files) that this module depends on. -LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libglog_init libyoga libreact_utils libreact_render_debug +LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libglog_init libyoga libreact_utils libreact_render_debug libreact_render_graphics # The static libraries (.a files) that this module depends on. LOCAL_STATIC_LIBRARIES := libreactnative libcallinvokerholder libruntimeexecutor @@ -76,6 +76,7 @@ $(call import-module,runtimeexecutor) # Fabric: $(call import-module,react/utils) $(call import-module,react/renderer/debug) +$(call import-module,react/renderer/graphics) include $(REACT_SRC_DIR)/reactperflogger/jni/Android.mk diff --git a/ReactCommon/react/renderer/graphics/Android.mk b/ReactCommon/react/renderer/graphics/Android.mk index ae97657ccc2..675a27973a5 100644 --- a/ReactCommon/react/renderer/graphics/Android.mk +++ b/ReactCommon/react/renderer/graphics/Android.mk @@ -7,19 +7,23 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := fabricgraphics +LOCAL_MODULE := react_render_graphics LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/platform/cxx/react/renderer/graphics/*.cpp) -LOCAL_C_INCLUDES := $(LOCAL_PATH)/ -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../ $(LOCAL_PATH)/platform/cxx/ +LOCAL_SHARED_LIBRARIES := libfolly_json + +LOCAL_STATIC_LIBRARIES := + +LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../ $(LOCAL_PATH)/platform/cxx/ + +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../ $(LOCAL_PATH)/platform/cxx/ LOCAL_CFLAGS := \ -DLOG_TAG=\"Fabric\" LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall -LOCAL_STATIC_LIBRARIES := - - include $(BUILD_SHARED_LIBRARY) + +$(call import-module,folly)