Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f75adb71 authored by Yi Kong's avatar Yi Kong Committed by android-build-merger
Browse files

Merge "Add external projects only CFlags option" am: b7306c9c am: cdca7821 

am: e441f4a6

Change-Id: I3256e43b1bf01db6261ac956a385d3beabf7a643
parents e0173556 e441f4a6

core/binary.mk

+7 −0
Original line number Diff line number Diff line
@@ -405,6 +405,13 @@ ifneq (,$(my_cpp_std_version)) 
   my_cpp_std_cppflags := -std=$(my_cpp_std_version)

endif



# Extra cflags for projects under external/ directory

ifeq ($(my_clang),true)

ifeq ($(filter external/%,$(LOCAL_PATH)),)

    my_cflags += $(CLANG_EXTERNAL_CFLAGS)

endif

endif



# arch-specific static libraries go first so that generic ones can depend on them

my_static_libraries := $(LOCAL_STATIC_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_STATIC_LIBRARIES_$(my_32_64_bit_suffix)) $(my_static_libraries)

my_whole_static_libraries := $(LOCAL_WHOLE_STATIC_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_WHOLE_STATIC_LIBRARIES_$(my_32_64_bit_suffix)) $(my_whole_static_libraries)