From b7b83e4f128e1a4ea842148de1646422cc299bd5 Mon Sep 17 00:00:00 2001 From: Bret Johnson Date: Tue, 6 Oct 2015 03:52:45 -0700 Subject: [PATCH] Fixed to use ; instead of : as the path delimiter on Windows, for NDK_MODULE_PATH MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Summary: Also fixed the extra slash before first-party in that path (it was ...//first-party and is now .../first-party). The $dir funct always produces a result that ends with a /, so APP_MK_DIR always ends in a / and no extra / is needed when appending to it. With these two changes all of React Native for Android, including C++, seems to build OK on Windows :smile: Closes https://github.com/facebook/react-native/pull/2961 Reviewed By: @​svcscm Differential Revision: D2512239 Pulled By: @kmagiera fb-gh-sync-id: 4fbc9fc85bab455b8ed1e07a8ac299a48921753e --- ReactAndroid/src/main/jni/Application.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ReactAndroid/src/main/jni/Application.mk b/ReactAndroid/src/main/jni/Application.mk index d8f9dda84..f403e5ba1 100644 --- a/ReactAndroid/src/main/jni/Application.mk +++ b/ReactAndroid/src/main/jni/Application.mk @@ -4,7 +4,8 @@ APP_ABI := armeabi-v7a x86 APP_PLATFORM := android-9 APP_MK_DIR := $(dir $(lastword $(MAKEFILE_LIST))) -NDK_MODULE_PATH := $(APP_MK_DIR):$(THIRD_PARTY_NDK_DIR):$(APP_MK_DIR)/first-party + +NDK_MODULE_PATH := $(APP_MK_DIR)$(HOST_DIRSEP)$(THIRD_PARTY_NDK_DIR)$(HOST_DIRSEP)$(APP_MK_DIR)first-party APP_STL := gnustl_shared