Ensure the version of 'awk' detected by host-setup.sh is used during the build
diff --git a/ndk/build/core/add-application.mk b/ndk/build/core/add-application.mk
index bec8d5e..42abae3 100644
--- a/ndk/build/core/add-application.mk
+++ b/ndk/build/core/add-application.mk
@@ -61,7 +61,7 @@
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 94ac7bc..56781b5 100644
--- a/ndk/docs/CHANGES.TXT
+++ b/ndk/docs/CHANGES.TXT
@@ -10,6 +10,8 @@
- 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
