StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Define __ANDROID_API__ when building for the NDK."

Browse Source 
am: 30fe7576d0

Change-Id: I4aa349b7293db5e9e7214cdb10a682164214de60
This commit is contained in:
Dan Albert
2016-08-06 01:18:58 +00:00
committed by android-build-merger
parent db4c597d5f 30fe7576d0
commit aede8d4912
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/binary.mk
View File

@@ -99,6 +99,11 @@ ifdef LOCAL_SDK_VERSION
$(shell if [ $(LOCAL_SDK_VERSION) -lt $(my_min_sdk_version) ]; then \ $(shell if [ $(LOCAL_SDK_VERSION) -lt $(my_min_sdk_version) ]; then \
echo $(my_min_sdk_version); else echo $(LOCAL_SDK_VERSION); fi) 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 := \ my_ndk_source_root := \
$(HISTORICAL_NDK_VERSIONS_ROOT)/$(LOCAL_NDK_VERSION)/sources $(HISTORICAL_NDK_VERSIONS_ROOT)/$(LOCAL_NDK_VERSION)/sources
my_ndk_sysroot := \ my_ndk_sysroot := \