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

am 10e2d222: am d463f6e9: am 34959e0b: Merge "Clean up libc/Android.mk a bit after the crtbrand changes."

Browse Source 
* commit '10e2d222ce3db0c310c00cd1a5cffdd2223b5dfe':
  Clean up libc/Android.mk a bit after the crtbrand changes.
This commit is contained in:
Elliott Hughes 2012-08-08 14:43:55 -07:00 committed by Android Git Automerger
commit 96fd66018c
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libc/Android.mk
View File

@ -529,18 +529,13 @@ else
libc_common_cflags += -DANDROID_SMP=0
endif
# Needed to access private/__dso_handle.h from
# crtbegin_xxx.c and crtend_xxx.c
#
libc_crt_target_cflags += -I$(LOCAL_PATH)/private \
# crtbrand.c needs <stdint.h> and a #define for the platform SDK version.
libc_crt_target_cflags += \
-I$(LOCAL_PATH)/include \
-I$(LOCAL_PATH)/kernel/common \
-I$(LOCAL_PATH)/kernel/arch-$(TARGET_ARCH) \
-I$(LOCAL_PATH)/arch-$(TARGET_ARCH)/include \
-DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
ifeq ($(TARGET_ARCH),arm)
libc_crt_target_cflags += -DCRT_LEGACY_WORKAROUND
libc_crt_target_cflags += -DCRT_LEGACY_WORKAROUND
endif
# Define some common includes
@ -553,8 +548,9 @@ libc_common_c_includes := \
# Needed to access private/__dso_handle.h from
# crtbegin_xxx.S and crtend_xxx.S
#
libc_crt_target_cflags += -I$(LOCAL_PATH)/private -I$(LOCAL_PATH)/arch-$(TARGET_ARCH)/include
libc_crt_target_cflags += \
-I$(LOCAL_PATH)/private \
-I$(LOCAL_PATH)/arch-$(TARGET_ARCH)/include
# Define the libc run-time (crt) support object files that must be built,
# which are needed to build all other objects (shared/static libs and