commit f8a66bb31204b42f830c1865a795b5f3eb1e0147
author Elliott Hughes <enh@google.com> Thu Jul 18 00:39:35 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 18 00:39:35 2013 +0000
tree 8fca4849a4f58d2ac7f8a08c22a7ba49d60d5193
parent 8fa9081f48c4861f83737d59bf2c2c8f21c7da3f
parent 4c6b925bac0ebe2898acbcb4c4ba257463dbfc26

Merge "Remove some non-unused makefile generality."

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index bfeb391..a6b464f 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -569,23 +569,17 @@
 # static C++ destructors are properly called on dlclose().
 #
 ifeq ($(TARGET_ARCH),arm)
-    libc_crtbegin_extension := c
     libc_crt_target_so_cflags :=
 endif
 ifeq ($(TARGET_ARCH),mips)
-    libc_crtbegin_extension := c
     libc_crt_target_so_cflags := -fPIC
 endif
 ifeq ($(TARGET_ARCH),x86)
-    libc_crtbegin_extension := c
     libc_crt_target_so_cflags := -fPIC
 endif
-ifeq ($(libc_crtbegin_extension),)
-    $(error $(TARGET_ARCH) not supported)
-endif
 libc_crt_target_so_cflags += $(libc_crt_target_cflags)
-libc_crt_target_crtbegin_file := $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin.$(libc_crtbegin_extension)
-libc_crt_target_crtbegin_so_file := $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin_so.$(libc_crtbegin_extension)
+libc_crt_target_crtbegin_file := $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin.c
+libc_crt_target_crtbegin_so_file := $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin_so.c
 
 # See the comment in crtbrand.c for the reason why we need to generate
 # crtbrand.s before generating crtbrand.o.