From 8e996487e147cefbd48d768f5f0864cd718459ee Mon Sep 17 00:00:00 2001 From: David Vacca Date: Wed, 5 Aug 2020 23:59:46 -0700 Subject: [PATCH] Create Android MK file for debug module Summary: This diff creates the Android.mk file for the fabric debug module This is necessary to enable fabric in RN OSS changelog: [internal] internal Reviewed By: fkgozali Differential Revision: D22908220 fbshipit-source-id: f970fa1d8534a6043f60f362740bfc3e5199b511 --- .../src/main/jni/react/jni/Android.mk | 7 ++++- ReactCommon/react/renderer/debug/Android.mk | 27 +++++++++++++++++++ ReactCommon/react/utils/Android.mk | 2 +- 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 ReactCommon/react/renderer/debug/Android.mk diff --git a/ReactAndroid/src/main/jni/react/jni/Android.mk b/ReactAndroid/src/main/jni/react/jni/Android.mk index b649da6329c..1288f3f646e 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 +LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libglog_init libyoga libreact_utils libreact_render_debug # The static libraries (.a files) that this module depends on. LOCAL_STATIC_LIBRARIES := libreactnative libcallinvokerholder libruntimeexecutor @@ -73,6 +73,11 @@ $(call import-module,reactperflogger) $(call import-module,hermes) $(call import-module,runtimeexecutor) +# Fabric: +$(call import-module,react/utils) +$(call import-module,react/renderer/debug) + + include $(REACT_SRC_DIR)/reactperflogger/jni/Android.mk include $(REACT_SRC_DIR)/turbomodule/core/jni/Android.mk diff --git a/ReactCommon/react/renderer/debug/Android.mk b/ReactCommon/react/renderer/debug/Android.mk new file mode 100644 index 00000000000..6a86e43ab31 --- /dev/null +++ b/ReactCommon/react/renderer/debug/Android.mk @@ -0,0 +1,27 @@ +# Copyright (c) Facebook, Inc. and its affiliates. +# +# This source code is licensed under the MIT license found in the +# LICENSE file in the root directory of this source tree. + +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_MODULE := react_render_debug + +LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../ + +LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) + +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../ + +LOCAL_SHARED_LIBRARIES := libfolly_json + +LOCAL_CFLAGS := \ + -DLOG_TAG=\"Fabric\" + +LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall + +include $(BUILD_SHARED_LIBRARY) + +$(call import-module,folly) diff --git a/ReactCommon/react/utils/Android.mk b/ReactCommon/react/utils/Android.mk index 702405ae16d..8a8cfca1797 100644 --- a/ReactCommon/react/utils/Android.mk +++ b/ReactCommon/react/utils/Android.mk @@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := reactutils +LOCAL_MODULE := react_utils LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)