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

Ensure the version of 'awk' detected by host-setup.sh is used during the build

Browse Source
This commit is contained in:
David 'Digit' Turner
2009-10-01 16:44:54 -07:00
parent 79adc9fc90
commit cc230ba07c
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,7 +61,7 @@ APP_PLATFORM := $(strip $(APP_PLATFORM))
ifndef APP_PLATFORM ifndef APP_PLATFORM
_local_props := $(strip $(wildcard $(APP_PROJECT_PATH)/default.properties)) _local_props := $(strip $(wildcard $(APP_PROJECT_PATH)/default.properties))
ifdef _local_props ifdef _local_props
APP_PLATFORM := $(strip $(shell awk -f $(BUILD_SYSTEM)/extract-platform.awk < $(_local_props))) APP_PLATFORM := $(strip $(shell $(HOST_AWK) -f $(BUILD_SYSTEM)/extract-platform.awk < $(_local_props)))
$(call ndk_log, Found APP_PLATFORM=$(APP_PLATFORM) in $(_local_props)) $(call ndk_log, Found APP_PLATFORM=$(APP_PLATFORM) in $(_local_props))
else else
APP_PLATFORM := android-3 APP_PLATFORM := android-3

2
ndk/docs/CHANGES.TXT
View File

@@ -10,6 +10,8 @@ IMPORTANT BUG FIXES:
- Make target shared libraries portable to systems that don't use the exact same - Make target shared libraries portable to systems that don't use the exact same
toolchain (GCC 4.2.1) . toolchain (GCC 4.2.1) .
- Actually use the awk version detected by host-setup.sh during the build.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
android-ndk-1.6_r1 android-ndk-1.6_r1