summaryrefslogtreecommitdiff
path: root/ACE/include/makeinclude/platform_android.GNU
diff options
context:
space:
mode:
authorFred Hornsey <fred@hornsey.us>2018-10-17 20:24:30 -0500
committerFred Hornsey <fred@hornsey.us>2018-10-17 20:24:30 -0500
commitcc9d5d4d536cc031253b986b5fbd4abd07f3652e (patch)
tree14470c314769f0e7aa661fdb5a7e2a746a2f8601 /ACE/include/makeinclude/platform_android.GNU
parent85291bed9f9e941d64e3e2b91c36e9761908f55c (diff)
downloadATCD-cc9d5d4d536cc031253b986b5fbd4abd07f3652e.tar.gz
config-android.h: Update for Newer NDK
Diffstat (limited to 'ACE/include/makeinclude/platform_android.GNU')
-rw-r--r--ACE/include/makeinclude/platform_android.GNU12
1 files changed, 12 insertions, 0 deletions
diff --git a/ACE/include/makeinclude/platform_android.GNU b/ACE/include/makeinclude/platform_android.GNU
index 773542bf2d3..691405263c8 100644
--- a/ACE/include/makeinclude/platform_android.GNU
+++ b/ACE/include/makeinclude/platform_android.GNU
@@ -131,6 +131,18 @@ else
include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
endif
+ifeq ($(shell echo '\#include "android/ndk-version.h"' | $(CXX) -E - > /dev/null 2>&1; echo $$?), 0)
+ CPPFLAGS += -DACE_ANDROID_NDK_HAS_NDK_VERSION_H
+endif
+
+ifdef __NDK_MAJOR__
+ CPPFLAGS += -D__NDK_MAJOR__=$(__NDK_MAJOR__)
+endif
+
+ifdef __NDK_MINOR__
+ CPPFLAGS += -D__NDK_MINOR__=$(__NDK_MINOR__)
+endif
+
OCFLAGS ?= -O3
OCCFLAGS ?= -O3