commit f574ce603a65008fe9b9e95fd21c90a1f3d3dee3
author Nick Kralevich <nnk@google.com> Mon Aug 13 09:51:48 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 13 09:51:48 2012 -0700
tree 33f55f72063f1dbd1482708a8e1f79a10bb2011e
parent 259f4a1503a05e61fa4e50c08593eb92ce4f450a
parent 34e5212961cb64cf690289bc94c59b3b6245694c

am 34e52129: am 19b10419: am 89fd9ecc: am 20b94c0c: Merge "linker: don\'t perform unnecessary mprotects"

* commit '34e5212961cb64cf690289bc94c59b3b6245694c':
  linker: don't perform unnecessary mprotects

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index 04b8ed1..9b25a69 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -772,6 +772,9 @@
 LOCAL_WHOLE_STATIC_LIBRARIES := libbionic_ssp libc_netbsd
 LOCAL_SYSTEM_SHARED_LIBRARIES :=
 
+# TODO: split out the asflags.
+LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
+
 include $(BUILD_STATIC_LIBRARY)
 
 

linker/Android.mk

diff --git a/linker/Android.mk b/linker/Android.mk
index b519976..5f6eb61 100644
--- a/linker/Android.mk
+++ b/linker/Android.mk
@@ -65,6 +65,9 @@
 # just for this module
 LOCAL_NO_CRT := true
 
+# TODO: split out the asflags.
+LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
+
 include $(BUILD_SYSTEM)/dynamic_binary.mk
 
 $(linked_module): $(TARGET_CRTBEGIN_STATIC_O) $(all_objects) $(all_libraries) $(TARGET_CRTEND_O)