LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am b48ab640: Allow applications to target future API levels

Browse Source 
Merge commit 'b48ab6402801d82ac205b34ffa1bc6787a0042b6' into eclair-mr2

* commit 'b48ab6402801d82ac205b34ffa1bc6787a0042b6':
  Allow applications to target future API levels
This commit is contained in:
David 'Digit' Turner
2009-10-22 10:45:58 -07:00
committed by Android Git Automerger
parent a8bd6dacdc b48ab64028
commit 476ba9449a
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ndk/build/core/add-application.mk
View File

@@ -69,11 +69,14 @@ ifndef APP_PLATFORM
endif
endif
# Check that the value of APP_PLATFORM corresponds to a known platform
# If not, we're going to use the max supported platform value.
#
_bad_platform := $(strip $(filter-out $(NDK_ALL_PLATFORMS),$(APP_PLATFORM)))
ifdef _bad_platform
$(call __ndk_info,Application $(_name) targets platform '$(_bad_platform)')
$(call __ndk_info,which is not supported by this release of the Android NDK)
$(call __ndk_error,Aborting...)
$(call __ndk_info,Application $(_name) targets unknown platform '$(_bad_platform)')
APP_PLATFORM := android-$(NDK_MAX_PLATFORM_LEVEL)
$(call __ndk_info,Switching to $(APP_PLATFORM))
endif
# If APP_BUILD_SCRIPT is defined, check that the file exists.

12
ndk/build/core/main.mk
View File

@@ -114,6 +114,18 @@ $(foreach _platform,$(NDK_ALL_PLATFORMS),\
$(eval include $(BUILD_SYSTEM)/add-platform.mk)\
)
# we're going to find the maximum platform number of the form android-<number>
# ignore others, which could correspond to special and experimental cases
NDK_ALL_PLATFORM_LEVELS := $(filter android-%,$(NDK_ALL_PLATFORMS))
NDK_ALL_PLATFORM_LEVELS := $(patsubst android-%,%,$(NDK_ALL_PLATFORM_LEVELS))
$(call ndk_log,Found stable platform levels: $(NDK_ALL_PLATFORM_LEVELS))
NDK_MAX_PLATFORM_LEVEL := 3
$(foreach level,$(NDK_ALL_PLATFORM_LEVELS),\
$(eval NDK_MAX_PLATFORM_LEVEL := $$(call max,$$(NDK_MAX_PLATFORM_LEVEL),$$(level)))\
)
$(call ndk_log,Found max platform level: $(NDK_MAX_PLATFORM_LEVEL))
# ====================================================================
#
# Read all application configuration files