From 48203f8a75be698c790e664e2ab93e900915d97d Mon Sep 17 00:00:00 2001
From: Kenneth Geisshirt <geisshirt@gmail.com>
Date: Tue, 3 Jul 2018 14:12:14 +0200
Subject: [PATCH] Fixing unsolved symbol in RN Android (#1907)

---
 CHANGELOG.md                                 | 22 ++++++++++++++++++++
 react-native/android/src/main/jni/Android.mk |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 117aeee3..442e6aa4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+X.Y.Z Release notes
+=============================================================
+### Compatibility
+* Sync protocol: 24
+* Server-side history format: 4
+* File format: 7
+* Realm Object Server: 3.0.0 or later
+
+### Breaking changes
+* None.
+
+### Enhancements
+* None.
+
+### Bug fixes
+* Fixed a bug which caused RN Android to fail loading (#1904).
+
+### Internals
+* Realm Core v5.6.3.
+* Realm Sync v3.5.8.
+
+
 2.11.0 Release notes (2018-6-28)
 =============================================================
 ### Compatibility
diff --git a/react-native/android/src/main/jni/Android.mk b/react-native/android/src/main/jni/Android.mk
index 935306e0..9344056d 100644
--- a/react-native/android/src/main/jni/Android.mk
+++ b/react-native/android/src/main/jni/Android.mk
@@ -48,6 +48,7 @@ LOCAL_SRC_FILES += src/android/io_realm_react_RealmReactModule.cpp
 LOCAL_SRC_FILES += src/android/jni_utils.cpp
 LOCAL_SRC_FILES += src/android/jsc_override.cpp
 LOCAL_SRC_FILES += src/android/platform.cpp
+LOCAL_SRC_FILES += src/android/hack.cpp
 LOCAL_SRC_FILES += src/object-store/src/impl/collection_change_builder.cpp
 LOCAL_SRC_FILES += src/object-store/src/impl/collection_notifier.cpp
 LOCAL_SRC_FILES += src/object-store/src/impl/list_notifier.cpp
@@ -84,7 +85,6 @@ endif
 
 # Workaround for memmove/memcpy bug
 ifeq ($(strip $(TARGET_ARCH_ABI)),armeabi-v7a)
-LOCAL_SRC_FILES += src/android/hack.cpp
 BUILD_WRAP_MEMMOVE = 1
 else
 BUILD_WRAP_MEMMOVE = 0