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

Commit 3ee9daac authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "Remove WITHOUT_(HOST|TARGET)_CLANG."

parents 6fb36397 32f7ff14

core/binary.mk

+0 −4
Original line number Diff line number Diff line
@@ -198,10 +198,6 @@ else ifeq ($(USE_CLANG_PLATFORM_BUILD),true) 
    endif

endif



ifeq ($(strip $($(LOCAL_2ND_ARCH_VAR_PREFIX)WITHOUT_$(my_prefix)CLANG)),true)

  my_clang :=

endif



my_cpp_std_version := -std=gnu++14

ifdef LOCAL_SDK_VERSION

    # The NDK handles this itself.

core/clang/config.mk

+0 −6
Original line number Diff line number Diff line 
## Clang configurations.



# WITHOUT_CLANG covers both HOST and TARGET

ifeq ($(WITHOUT_CLANG),true)

WITHOUT_TARGET_CLANG := true

WITHOUT_HOST_CLANG := true

endif



LLVM_PREBUILTS_VERSION := 3.6

LLVM_PREBUILTS_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/$(LLVM_PREBUILTS_VERSION)/bin

LLVM_RTLIB_PATH := $(LLVM_PREBUILTS_PATH)/../lib/clang/$(LLVM_PREBUILTS_VERSION)/lib/linux/