Merge pull request facebook#1006 from rasaha91/0.64-stable-android-pr…

…-fixes

Cherry pick changes to fix building rn-tester app for android from main to 0.64-stable

.ado/android-pr.yml

@@ -44,6 +44,11 @@ jobs:
         inputs:
           script: REACT_NATIVE_BOOST_PATH=$(System.DefaultWorkingDirectory)/build_deps ./gradlew installArchives -Pparam="excludeLibs"
 
+      - task: CmdLine@2
+        displayName: Build rn-tester
+        inputs:
+          script: REACT_NATIVE_BOOST_PATH=$(System.DefaultWorkingDirectory)/build_deps ./gradlew :packages:rn-tester:android:app:assemble
+
       - template: templates\prep-android-nuget.yml
 
       # Verify depenendencies can be enumerated and downloaded ..

android-patches/patches/Build/ReactAndroid/Android-prebuilt.mk

@@ -0,0 +1,13 @@
+diff --git a/ReactAndroid/Android-prebuilt.mk b/ReactAndroid/Android-prebuilt.mk
+index 18f8c26620..1e5afe5751 100644
+--- a/ReactAndroid/Android-prebuilt.mk
++++ b/ReactAndroid/Android-prebuilt.mk
+@@ -34,7 +34,7 @@ include $(CLEAR_VARS)
+ LOCAL_MODULE := folly_json
+ 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)/boost/boost_1_68_0 \
+   $(THIRD_PARTY_NDK_DIR)/double-conversion \
+   $(THIRD_PARTY_NDK_DIR)/folly
+ # Note: Sync with folly/Android.mk.