generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename the misleading var name TARGET_OUT_STATIC_LIBRARIES

Browse Source 
TARGET_OUT_STATIC_LIBRARIES is actually the same as
TARGET_OUT_INTERMEDIATE_LIBRARIES.

Change-Id: I11ac35256031d461d20156cd4c19ed7eae781d22
This commit is contained in:
Ying Wang 2012-05-15 15:15:11 -07:00
parent 1b56aaa659
commit fc9e525fe0
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libc/Android.mk
View File

@ -559,13 +559,13 @@ ifeq ($(TARGET_ARCH),x86)
# This flag must be added for x86 targets, but not for ARM # This flag must be added for x86 targets, but not for ARM
libc_crt_target_so_cflags += -fPIC libc_crt_target_so_cflags += -fPIC
endif 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 $(GEN): $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin_so.S
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(TARGET_CC) $(libc_crt_target_so_cflags) -o $@ -c $< $(TARGET_CC) $(libc_crt_target_so_cflags) -o $@ -c $<
ALL_GENERATED_SOURCES += $(GEN) 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 $(GEN): $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtend_so.S
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(TARGET_CC) $(libc_crt_target_so_cflags) -o $@ -c $< $(TARGET_CC) $(libc_crt_target_so_cflags) -o $@ -c $<
@ -573,13 +573,13 @@ ALL_GENERATED_SOURCES += $(GEN)
endif # TARGET_ARCH == x86 || TARGET_ARCH == arm 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 $(GEN): $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin_static.S
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(TARGET_CC) $(libc_crt_target_cflags) -o $@ -c $< $(TARGET_CC) $(libc_crt_target_cflags) -o $@ -c $<
ALL_GENERATED_SOURCES += $(GEN) 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 $(GEN): $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin_dynamic.S
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(TARGET_CC) $(libc_crt_target_cflags) -o $@ -c $< $(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 # We rename crtend.o to crtend_android.o to avoid a
# name clash between gcc and bionic. # 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 $(GEN): $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtend.S
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(TARGET_CC) $(libc_crt_target_cflags) -o $@ -c $< $(TARGET_CC) $(libc_crt_target_cflags) -o $@ -c $<

4
libdl/Android.mk
View File

@ -36,12 +36,12 @@ LOCAL_SYSTEM_SHARED_LIBRARIES :=
ifeq ($(TARGET_ARCH),sh) ifeq ($(TARGET_ARCH),sh)
# for SuperH, additional code is necessary to handle .ctors section. # for SuperH, additional code is necessary to handle .ctors section.
GEN_SOBEGIN := $(TARGET_OUT_STATIC_LIBRARIES)/sobegin.o GEN_SOBEGIN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/sobegin.o
$(GEN_SOBEGIN): $(LOCAL_PATH)/arch-sh/sobegin.S $(GEN_SOBEGIN): $(LOCAL_PATH)/arch-sh/sobegin.S
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(TARGET_CC) -o $@ -c $< $(TARGET_CC) -o $@ -c $<
GEN_SOEND := $(TARGET_OUT_STATIC_LIBRARIES)/soend.o GEN_SOEND := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/soend.o
$(GEN_SOEND): $(LOCAL_PATH)/arch-sh/soend.S $(GEN_SOEND): $(LOCAL_PATH)/arch-sh/soend.S
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(TARGET_CC) -o $@ -c $< $(TARGET_CC) -o $@ -c $<