From 76be660aae0911467c51dc3f86a4f8d7fed5b332 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 8 Aug 2012 14:07:37 -0700 Subject: [PATCH] Clean up libc/Android.mk a bit after the crtbrand changes. Change-Id: Icfb95fffe70967418cd93da8cbeae22dcd68f8c9 --- libc/Android.mk | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/libc/Android.mk b/libc/Android.mk index e88102a77..fd81d7ea3 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -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 \ - -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) +# crtbrand.c needs and a #define for the platform SDK version. +libc_crt_target_cflags += \ + -I$(LOCAL_PATH)/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