diff options
| author | Jason Sanmiya <jsanmiya@google.com> | 2015-03-26 10:35:52 -0700 |
|---|---|---|
| committer | Jason Sanmiya <jsanmiya@google.com> | 2015-03-27 09:27:18 -0700 |
| commit | e8598950fc37bfb1dbfdd135570bdd6f2d2f385a (patch) | |
| tree | 80940414fd349103ac51ee78293e44c953c289bd /android | |
| parent | ca5c9e7496c79deb4d1e80258d3293e46397f4d8 (diff) | |
| download | flatbuffers-e8598950fc37bfb1dbfdd135570bdd6f2d2f385a.tar.gz flatbuffers-e8598950fc37bfb1dbfdd135570bdd6f2d2f385a.tar.bz2 flatbuffers-e8598950fc37bfb1dbfdd135570bdd6f2d2f385a.zip | |
Fix Mac ndk-build error on motive, pie_noon, pindrop.
We were looking for 'flatc' in motive/bin/Debug/flatc,
on Mac. It's actually built to flatbuffers/Debug/flatc.
Tested: OS X Yosemite, ndk-r10d. Also tested on Linux.
Change-Id: I9f1ecfe00c5f42fd9b6808b5a5da1c920487a4c2
Diffstat (limited to 'android')
| -rw-r--r-- | android/jni/include.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/android/jni/include.mk b/android/jni/include.mk index 3ce49f20..5c16db98 100644 --- a/android/jni/include.mk +++ b/android/jni/include.mk @@ -49,15 +49,20 @@ endif # The following block generates build rules which result in headers being # rebuilt from flatbuffers schemas. +FLATBUFFERS_CMAKELISTS_DIR := \ + $(realpath $(dir $(lastword $(MAKEFILE_LIST)))/../..) + # Directory that contains the FlatBuffers compiler. -FLATBUFFERS_FLATC_PATH?=$(CURDIR)/bin ifeq (Windows,$(PROJECT_OS)) +FLATBUFFERS_FLATC_PATH?=$(CURDIR)/bin FLATBUFFERS_FLATC := $(FLATBUFFERS_FLATC_PATH)/Debug/flatc.exe endif ifeq (Linux,$(PROJECT_OS)) +FLATBUFFERS_FLATC_PATH?=$(CURDIR)/bin FLATBUFFERS_FLATC := $(FLATBUFFERS_FLATC_PATH)/flatc endif ifeq (Darwin,$(PROJECT_OS)) +FLATBUFFERS_FLATC_PATH?=$(FLATBUFFERS_CMAKELISTS_DIR) FLATBUFFERS_FLATC := $(FLATBUFFERS_FLATC_PATH)/Debug/flatc endif @@ -80,8 +85,6 @@ CMAKE := cmake endif # Generate a host build rule for the flatbuffers compiler. -FLATBUFFERS_CMAKELISTS_DIR := \ - $(realpath $(dir $(lastword $(MAKEFILE_LIST)))/../..) ifeq (Windows,$(PROJECT_OS)) define build_flatc_recipe cd & jni\build_flatc.bat $(CMAKE) |