diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2015-01-20 15:33:26 -0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2015-01-29 11:27:47 -0800 |
| commit | 6df7fc4badb638de7917b03a19ff0697a5fb4243 (patch) | |
| tree | d7df610d0cf3dd591d301f798f4992d211de4831 /build | |
| parent | dac3c4f306450b5192c5f1229e9e0eae46917ba3 (diff) | |
| download | ndk-6df7fc4badb638de7917b03a19ff0697a5fb4243.tar.gz | |
Use APP_PROJECT_PATH if NDK_PROJECT_PATH isn't set
APP_PROJECT_PATH is documented as an absolute path to project root
directory but it doesn't work as intended because currently ndk-build
uses NDK_PROJECT_PATH instead. NDK_PROJECT_PATH cannot be replaced with
APP_PROJECT_PATH because SDK integration (where NDK_PROJECT_PATH=null
tells ndk-build to stop searching for Android.mk because SDK always explicitly
provides it via APP_BUILD_SCRIPT) This CL simpliy sets empty NDK_PROJECT_PATH
to APP_PROJECT_PATH, and check consistency when both are set.
Change-Id: I373f333f0787ad0a5d2ceddd4f18262ab085425d
Diffstat (limited to 'build')
| -rw-r--r-- | build/core/build-local.mk | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/build/core/build-local.mk b/build/core/build-local.mk index 860a7846f..384ffb779 100644 --- a/build/core/build-local.mk +++ b/build/core/build-local.mk @@ -111,6 +111,22 @@ find-project-dir-inner-2 = \ ) 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)) |