From 7f0688dd93a4c58824411e87425dea596fb3d742 Mon Sep 17 00:00:00 2001
From: David 'Digit' Turner <digit@google.com>
Date: Mon, 20 Jul 2009 15:38:48 +0200
Subject: [PATCH] Fix compilation of assembly files (e.g. foo.S), by removing a
 typo.

---
 ndk/build/core/definitions.mk | 2 +-
 ndk/docs/CHANGES.TXT          | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ndk/build/core/definitions.mk b/ndk/build/core/definitions.mk
index 56e50e509..b5079e205 100644
--- a/ndk/build/core/definitions.mk
+++ b/ndk/build/core/definitions.mk
@@ -404,7 +404,7 @@ compile-c-source = $(eval $(call ev-compile-c-source,$1,$(1:%.c=%.o)))
 # Usage     : $(call compile-s-source,<srcfile>)
 # Rationale : Setup everything required to build a single Assembly source file
 # -----------------------------------------------------------------------------
-compile-s-source = $(eval $(call ev-compile-s-source,$1,$(1:%.S=%.o)))
+compile-s-source = $(eval $(call ev-compile-c-source,$1,$(1:%.S=%.o)))
 
 
 # -----------------------------------------------------------------------------
diff --git a/ndk/docs/CHANGES.TXT b/ndk/docs/CHANGES.TXT
index 2509fe9b6..8f30f1fe5 100644
--- a/ndk/docs/CHANGES.TXT
+++ b/ndk/docs/CHANGES.TXT
@@ -30,5 +30,7 @@ current version
 
 - Add support for LOCAL_C_INCLUDES in Android.mk
 
+- Fix compilation of assembler files (e.g. foo.S)
+
 -------------------------------------------------------------------------------
 android-1.5_r1 released.