From cc230ba07c05ba5eec6412136ffebc4dd58e3aee Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Thu, 1 Oct 2009 16:44:54 -0700 Subject: [PATCH] Ensure the version of 'awk' detected by host-setup.sh is used during the build --- ndk/build/core/add-application.mk | 2 +- ndk/docs/CHANGES.TXT | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ndk/build/core/add-application.mk b/ndk/build/core/add-application.mk index bec8d5e3d..42abae324 100644 --- a/ndk/build/core/add-application.mk +++ b/ndk/build/core/add-application.mk @@ -61,7 +61,7 @@ APP_PLATFORM := $(strip $(APP_PLATFORM)) ifndef APP_PLATFORM _local_props := $(strip $(wildcard $(APP_PROJECT_PATH)/default.properties)) 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)) else APP_PLATFORM := android-3 diff --git a/ndk/docs/CHANGES.TXT b/ndk/docs/CHANGES.TXT index 94ac7bce2..56781b5d6 100644 --- a/ndk/docs/CHANGES.TXT +++ b/ndk/docs/CHANGES.TXT @@ -10,6 +10,8 @@ IMPORTANT BUG FIXES: - Make target shared libraries portable to systems that don't use the exact same toolchain (GCC 4.2.1) . +- Actually use the awk version detected by host-setup.sh during the build. + ------------------------------------------------------------------------------- android-ndk-1.6_r1