commit edf04ae2e24597b0afb9d44fadf8d714a9fc8030
author Andrew Hsieh <andrewhsieh@google.com> Fri Feb 13 07:01:30 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 13 07:01:32 2015 +0000
tree 60ff9079944d44a36d69a34a5ce10bdb6173f135
parent 24e184b915157af4ff037aa1c94780ba2eb4f501
parent 6df7fc4badb638de7917b03a19ff0697a5fb4243

Merge "Use APP_PROJECT_PATH if NDK_PROJECT_PATH isn't set"

build/core/build-local.mk

diff --git a/build/core/build-local.mk b/build/core/build-local.mk
index 860a784..384ffb7 100644
--- a/build/core/build-local.mk
+++ b/build/core/build-local.mk
@@ -111,6 +111,22 @@
     )
 
 NDK_PROJECT_PATH := $(strip $(NDK_PROJECT_PATH))
+APP_PROJECT_PATH := $(strip $(APP_PROJECT_PATH))
+
+ifneq (,$(APP_PROJECT_PATH))
+    ifeq (,$(NDK_PROJECT_PATH))
+        # If NDK_PROJECT_PATH isn't set and APP_PROJECT_PATH is present, use APP_PROJECT_PATH
+        $(call ndk_log,Use APP_PROJECT_PATH for NDK_PROJECT_PATH: $(APP_PROJECT_PATH))
+        NDK_PROJECT_PATH := $(APP_PROJECT_PATH)
+    else
+        # If both NDK_PROJECT_PATH and APP_PROJECT_PATH are present, check consistency
+        ifneq ($(NDK_PROJECT_PATH),$(APP_PROJECT_PATH))
+            $(call __ndk_info,WARNING: NDK_PROJECT_PATH and APP_PROJECT_PATH are both set but not equal literally)
+            $(call __ndk_info,  NDK_PROJECT_PATH = $(NDK_PROJECT_PATH))
+            $(call __ndk_info,  APP_PROJECT_PATH = $(APP_PROJECT_PATH))
+        endif
+    endif
+endif
 
 ifeq (null,$(NDK_PROJECT_PATH))