From 8fdb3decda2a082797af7e7eafba1af3e65aa311 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Thu, 6 Aug 2020 11:50:03 -0700 Subject: [PATCH] Extend components/scrollview module to compile in OSS Summary: This diff extends components/scrollview module to compile in OSS changelog: [internal] internal Reviewed By: JoshuaGross Differential Revision: D22918203 fbshipit-source-id: 6a67213bdcb4b4b2d47a2ee2a9796a134d744956 --- .../src/main/jni/react/jni/Android.mk | 3 +- .../renderer/components/scrollview/Android.mk | 35 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 ReactCommon/react/renderer/components/scrollview/Android.mk diff --git a/ReactAndroid/src/main/jni/react/jni/Android.mk b/ReactAndroid/src/main/jni/react/jni/Android.mk index 2e6eabd64bc..13d342bc038 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 libreact_render_graphics libreact_render_core libreact_render_mapbuffer react_render_componentregistry libreact_render_components_view libreact_render_components_view libreact_render_components_unimplementedview libreact_render_components_root +LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libglog_init libyoga libreact_utils libreact_render_debug libreact_render_graphics libreact_render_core libreact_render_mapbuffer react_render_componentregistry libreact_render_components_view libreact_render_components_view libreact_render_components_unimplementedview libreact_render_components_root libreact_render_components_scrollview # The static libraries (.a files) that this module depends on. LOCAL_STATIC_LIBRARIES := libreactnative libcallinvokerholder libruntimeexecutor @@ -78,6 +78,7 @@ $(call import-module,react/utils) $(call import-module,react/renderer/componentregistry) $(call import-module,react/renderer/core) $(call import-module,react/renderer/components/root) +$(call import-module,react/renderer/components/scrollview) $(call import-module,react/renderer/components/unimplementedview) $(call import-module,react/renderer/components/view) $(call import-module,react/renderer/debug) diff --git a/ReactCommon/react/renderer/components/scrollview/Android.mk b/ReactCommon/react/renderer/components/scrollview/Android.mk new file mode 100644 index 00000000000..f7128643649 --- /dev/null +++ b/ReactCommon/react/renderer/components/scrollview/Android.mk @@ -0,0 +1,35 @@ +# 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_components_scrollview + +LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) + +LOCAL_C_INCLUDES := $(LOCAL_PATH)/ +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../ + +LOCAL_CFLAGS := \ + -DLOG_TAG=\"Fabric\" + +LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall + +LOCAL_STATIC_LIBRARIES := + +LOCAL_SHARED_LIBRARIES := libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_components_view + +include $(BUILD_SHARED_LIBRARY) + +$(call import-module,glog) +$(call import-module,folly) +$(call import-module,fbgloginit) +$(call import-module,react/renderer/components/view) +$(call import-module,react/renderer/core) +$(call import-module,react/renderer/debug) +$(call import-module,react/renderer/graphics) +$(call import-module,yogajni)