commit 7db4538ed6bca4bb790bf39b8f030682d30313a3
author Android (Google) Code Review <android-gerrit@google.com> Wed Jul 22 11:27:09 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 22 11:27:09 2009 -0700
tree d2fa62f2d93fb65c3c27fc051ba8ce6b70ba92da
parent 5ab2e21cf54570724a132b713c01bb9a4f556a2a
parent 70cebe238ef4173fff66967af91ee3c1e0ffd521

am 70cebe23: Merge change 8016 into donut

Merge commit '70cebe238ef4173fff66967af91ee3c1e0ffd521'

* commit '70cebe238ef4173fff66967af91ee3c1e0ffd521':
  Fix compilation of assembly files (e.g. foo.S), by removing a typo.

ndk/build/core/definitions.mk

diff --git a/ndk/build/core/definitions.mk b/ndk/build/core/definitions.mk
index 56e50e5..b5079e2 100644
--- a/ndk/build/core/definitions.mk
+++ b/ndk/build/core/definitions.mk
@@ -404,7 +404,7 @@
 # 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)))
 
 
 # -----------------------------------------------------------------------------

ndk/docs/CHANGES.TXT

diff --git a/ndk/docs/CHANGES.TXT b/ndk/docs/CHANGES.TXT
index 2509fe9..8f30f1f 100644
--- a/ndk/docs/CHANGES.TXT
+++ b/ndk/docs/CHANGES.TXT
@@ -30,5 +30,7 @@
 
 - Add support for LOCAL_C_INCLUDES in Android.mk
 
+- Fix compilation of assembler files (e.g. foo.S)
+
 -------------------------------------------------------------------------------
 android-1.5_r1 released.