From 78b6cea65e531f89f7b2af7a816fb8a76c100ca2 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Tue, 30 Sep 2014 14:23:14 -0700 Subject: [PATCH] Clear all LOCAL_CLANG_*FLAGS*. Although only some of these flags will be used for some targets or hosts, they must all be cleared to avoid carrying over from one project to another. BUG: 17677366 Change-Id: I6d26fa7e5bf2ff11758728810d4874f3759aebe7 --- core/clear_vars.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 8182e486d..64aabda75 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -201,11 +201,15 @@ LOCAL_PREBUILT_JNI_LIBS_$(TARGET_2ND_ARCH):= endif LOCAL_SRC_FILES_$(HOST_ARCH):= LOCAL_CFLAGS_$(HOST_ARCH):= +LOCAL_CLANG_CFLAGS_$(HOST_ARCH):= LOCAL_CPPFLAGS_$(HOST_ARCH):= +LOCAL_CLANG_CPPFLAGS_$(HOST_ARCH):= LOCAL_C_INCLUDES_$(HOST_ARCH):= LOCAL_ASFLAGS_$(HOST_ARCH):= +LOCAL_CLANG_ASFLAGS_$(HOST_ARCH):= LOCAL_NO_CRT_$(HOST_ARCH):= LOCAL_LDFLAGS_$(HOST_ARCH):= +LOCAL_CLANG_LDFLAGS_$(HOST_ARCH):= LOCAL_SHARED_LIBRARIES_$(HOST_ARCH):= LOCAL_STATIC_LIBRARIES_$(HOST_ARCH):= LOCAL_WHOLE_STATIC_LIBRARIES_$(HOST_ARCH):= @@ -215,11 +219,15 @@ LOCAL_CLANG_$(HOST_ARCH):= ifdef HOST_2ND_ARCH LOCAL_SRC_FILES_$(HOST_2ND_ARCH):= LOCAL_CFLAGS_$(HOST_2ND_ARCH):= +LOCAL_CLANG_CFLAGS_$(HOST_2ND_ARCH):= LOCAL_CPPFLAGS_$(HOST_2ND_ARCH):= +LOCAL_CLANG_CPPFLAGS_$(HOST_2ND_ARCH):= LOCAL_C_INCLUDES_$(HOST_2ND_ARCH):= LOCAL_ASFLAGS_$(HOST_2ND_ARCH):= +LOCAL_CLANG_ASFLAGS_$(HOST_2ND_ARCH):= LOCAL_NO_CRT_$(HOST_2ND_ARCH):= LOCAL_LDFLAGS_$(HOST_2ND_ARCH):= +LOCAL_CLANG_LDFLAGS_$(HOST_2ND_ARCH):= LOCAL_SHARED_LIBRARIES_$(HOST_2ND_ARCH):= LOCAL_STATIC_LIBRARIES_$(HOST_2ND_ARCH):= LOCAL_WHOLE_STATIC_LIBRARIES_$(HOST_2ND_ARCH):= -- 2.11.0