diff options
author | Ying Wang <wangying@google.com> | 2012-05-15 15:15:11 -0700 |
---|---|---|
committer | Ying Wang <wangying@google.com> | 2012-05-15 15:15:11 -0700 |
commit | fc9e525fe07846c1efa23235a59575f8dad69c53 (patch) | |
tree | 42ace96c6f5df709233c65760e572b223e65ef1d /libc/Android.mk | |
parent | 1b56aaa659174c56cd602dc54f119b40c5ca1af6 (diff) | |
download | bionic-fc9e525fe07846c1efa23235a59575f8dad69c53.zip bionic-fc9e525fe07846c1efa23235a59575f8dad69c53.tar.gz bionic-fc9e525fe07846c1efa23235a59575f8dad69c53.tar.bz2 |
Rename the misleading var name TARGET_OUT_STATIC_LIBRARIES
TARGET_OUT_STATIC_LIBRARIES is actually the same as
TARGET_OUT_INTERMEDIATE_LIBRARIES.
Change-Id: I11ac35256031d461d20156cd4c19ed7eae781d22
Diffstat (limited to 'libc/Android.mk')
-rw-r--r-- | libc/Android.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index a79d15c..0dbc0be 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -559,13 +559,13 @@ ifeq ($(TARGET_ARCH),x86) # This flag must be added for x86 targets, but not for ARM libc_crt_target_so_cflags += -fPIC endif -GEN := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_so.o +GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_so.o $(GEN): $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin_so.S @mkdir -p $(dir $@) $(TARGET_CC) $(libc_crt_target_so_cflags) -o $@ -c $< ALL_GENERATED_SOURCES += $(GEN) -GEN := $(TARGET_OUT_STATIC_LIBRARIES)/crtend_so.o +GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.o $(GEN): $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtend_so.S @mkdir -p $(dir $@) $(TARGET_CC) $(libc_crt_target_so_cflags) -o $@ -c $< @@ -573,13 +573,13 @@ ALL_GENERATED_SOURCES += $(GEN) endif # TARGET_ARCH == x86 || TARGET_ARCH == arm -GEN := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_static.o +GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o $(GEN): $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin_static.S @mkdir -p $(dir $@) $(TARGET_CC) $(libc_crt_target_cflags) -o $@ -c $< ALL_GENERATED_SOURCES += $(GEN) -GEN := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_dynamic.o +GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o $(GEN): $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin_dynamic.S @mkdir -p $(dir $@) $(TARGET_CC) $(libc_crt_target_cflags) -o $@ -c $< @@ -588,7 +588,7 @@ ALL_GENERATED_SOURCES += $(GEN) # We rename crtend.o to crtend_android.o to avoid a # name clash between gcc and bionic. -GEN := $(TARGET_OUT_STATIC_LIBRARIES)/crtend_android.o +GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_android.o $(GEN): $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtend.S @mkdir -p $(dir $@) $(TARGET_CC) $(libc_crt_target_cflags) -o $@ -c $< |