diff options
| author | Ying Wang <wangying@google.com> | 2013-08-15 11:01:10 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2013-08-15 11:01:10 -0700 |
| commit | f4723fa49b6e61f727b6321a4006ee8ba3f393b9 (patch) | |
| tree | d1726081a3a4c8729fcbbc6deeafe46659a830a2 /core/binary.mk | |
| parent | e391e7a86e806bd3d2549b6d12736166fafb746f (diff) | |
| download | build-f4723fa49b6e61f727b6321a4006ee8ba3f393b9.zip build-f4723fa49b6e61f727b6321a4006ee8ba3f393b9.tar.gz build-f4723fa49b6e61f727b6321a4006ee8ba3f393b9.tar.bz2 | |
No need to filter out AndroidConfig.h for unbundled build
for now we have all AndroidConfig.hs in the build project.
Change-Id: Id713fecba1378fad81688f5937f61c779b618ac2
Diffstat (limited to 'core/binary.mk')
| -rw-r--r-- | core/binary.mk | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/core/binary.mk b/core/binary.mk index 10d4927..e695567 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -141,21 +141,17 @@ LOCAL_ASFLAGS += -D__ASSEMBLY__ ifdef LOCAL_SDK_VERSION my_target_project_includes := my_target_c_includes := $(my_ndk_stl_include_path) $(my_ndk_version_root)/usr/include - -# filter out including of AndroidConfig.h in system/core. -TARGET_GLOBAL_CFLAGS_NO_ANDCONF ?= $(subst $(TARGET_ANDROID_CONFIG_CFLAGS),,\ - $(TARGET_GLOBAL_CFLAGS)) -my_target_global_cflags := $(TARGET_GLOBAL_CFLAGS_NO_ANDCONF) else my_target_project_includes := $(TARGET_PROJECT_INCLUDES) my_target_c_includes := $(TARGET_C_INCLUDES) -ifeq ($(strip $(LOCAL_CLANG)),true) -my_target_c_includes += $(CLANG_CONFIG_EXTRA_TARGET_C_INCLUDES) +endif # LOCAL_SDK_VERSION + +ifeq ($(LOCAL_CLANG),true) my_target_global_cflags := $(TARGET_GLOBAL_CLANG_FLAGS) +my_target_c_includes += $(CLANG_CONFIG_EXTRA_TARGET_C_INCLUDES) else my_target_global_cflags := $(TARGET_GLOBAL_CFLAGS) endif # LOCAL_CLANG -endif # LOCAL_SDK_VERSION $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_PROJECT_INCLUDES := $(my_target_project_includes) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_C_INCLUDES := $(my_target_c_includes) |