Merge "Define __ANDROID_API__ when building for the NDK." am: 30fe7576d0

am: aede8d4912

Change-Id: I26eec6e4cac0a30cb3184e3b1ea3893715950cae
This commit is contained in:
Dan Albert 2016-08-06 01:21:56 +00:00 committed by android-build-merger
commit 77233f4fc9
1 changed files with 5 additions and 0 deletions

View File

@ -99,6 +99,11 @@ ifdef LOCAL_SDK_VERSION
$(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 := \