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

Commit d7ac0198 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge changes from topic "clang_supported" 

am: 30f514cc

Change-Id: Ie6327c5bdeab61452d19284761953acbba1598b7
parents 9be8a792 30f514cc

core/base_rules.mk

+1 −1
Original line number Diff line number Diff line
@@ -667,7 +667,7 @@ endif 




ifdef j_or_n

$(j_or_n) $(h_or_t) $(j_or_n)-$(h_or_t) : $(my_checked_module)

$(j_or_n) $(h_or_t) $(j_or_n)-$(h_or_hc_or_t) : $(my_checked_module)

ifneq (,$(filter $(my_module_tags),tests))

$(j_or_n)-$(h_or_t)-tests $(j_or_n)-tests $(h_or_t)-tests : $(my_checked_module)

endif

core/binary.mk

+2 −2
Original line number Diff line number Diff line
@@ -387,9 +387,9 @@ endif 
# clang is enabled by default for host builds

# enable it unless we've specifically disabled clang above

ifdef LOCAL_IS_HOST_MODULE

    ifeq ($($(my_prefix)OS),windows)

    ifneq ($($(my_prefix)CLANG_SUPPORTED),true)

        ifeq ($(my_clang),true)

            $(error $(LOCAL_MODULE_MAKEFILE): $(LOCAL_MODULE): Clang is not yet supported for windows binaries)

            $(call pretty-error,Clang is not yet supported for $($(my_prefix)OS) binaries)

        endif

        my_clang := false

    else