diff --git a/core/binary.mk b/core/binary.mk index cf47374b5e..94e3a0fecb 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -32,6 +32,12 @@ else endif endif +# Third party code has additional no-override flags. +is_third_party := +ifneq ($(filter external/% hardware/% vendor/%,$(LOCAL_PATH)),) + is_third_party := true +endif + my_soong_problems := # The following LOCAL_ variables will be modified in this file. @@ -48,6 +54,10 @@ my_conlyflags := $(LOCAL_CONLYFLAGS) my_cppflags := $(LOCAL_CPPFLAGS) my_cflags_no_override := $(GLOBAL_CLANG_CFLAGS_NO_OVERRIDE) my_cppflags_no_override := $(GLOBAL_CLANG_CPPFLAGS_NO_OVERRIDE) +ifdef is_third_party + my_cflags_no_override += $(GLOBAL_CLANG_EXTERNAL_CFLAGS_NO_OVERRIDE) + my_cppflags_no_override += $(GLOBAL_CLANG_EXTERNAL_CFLAGS_NO_OVERRIDE) +endif my_ldflags := $(LOCAL_LDFLAGS) my_ldlibs := $(LOCAL_LDLIBS) my_asflags := $(LOCAL_ASFLAGS)