commit 30fe7576d03028e7f3e4d64ed38b65952aac1604
author Treehugger Robot <treehugger-gerrit@google.com> Sat Aug 06 00:52:33 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Aug 06 00:52:33 2016 +0000
tree 2d1052483cfff129b449583cca43065cbcc59a2f
parent bd9fb4ba0123563d303e04ee7bc21ffec48721ff
parent 754790d0a4729294612ca4014d474f754ded98bf

Merge "Define __ANDROID_API__ when building for the NDK."

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index fffb20d..e71507c 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -99,6 +99,11 @@
     $(shell if [ $(LOCAL_SDK_VERSION) -lt $(my_min_sdk_version) ]; then \
         echo $(my_min_sdk_version); else echo $(LOCAL_SDK_VERSION); fi)
 
+  # Traditionally this has come from android/api-level.h, but with the libc
+  # headers unified it must be set by the build system since we don't have
+  # per-API level copies of that header now.
+  my_cflags += -D__ANDROID_API__=$(my_ndk_api)
+
   my_ndk_source_root := \
       $(HISTORICAL_NDK_VERSIONS_ROOT)/$(LOCAL_NDK_VERSION)/sources
   my_ndk_sysroot := \