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

Commit f7dbab16 authored by Stephen Hines's avatar Stephen Hines
Browse files

Revert "Switch from clang 3.6 to new clang repository (with 3.8)." 

This reverts commit 1332828b.

Bug: 25141123

Change-Id: Idd5d8757095b2b370046a84aea76bc95e16f3876
parent f5782d60

core/clang/config.mk

+2 −1
Original line number Diff line number Diff line 
## Clang configurations.



LLVM_PREBUILTS_VERSION := 3.8

LLVM_PREBUILTS_VERSION := 3.6

FORCE_BUILD_SANITIZER_SHARED_OBJECTS := true

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

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

core/config_sanitizers.mk

+3 −5
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ ifneq ($(filter coverage,$(my_sanitize)),) 
endif



ifneq ($(my_sanitize),)

  fsanitize_arg := $(subst $(space),$(comma),$(my_sanitize))

  fsanitize_arg := $(subst $(space),$(comma),$(my_sanitize)),

  my_cflags += -fsanitize=$(fsanitize_arg)



  ifdef LOCAL_IS_HOST_MODULE
@@ -92,10 +92,8 @@ ifneq ($(my_sanitize),) 
    my_ldflags += -fsanitize=$(fsanitize_arg)

    my_ldlibs += -lrt -ldl

  else

    ifeq ($(filter address,$(my_sanitize)),)

      my_cflags += -fsanitize-trap=all

    my_cflags += -fsanitize-undefined-trap-on-error

    my_cflags += -ftrap-function=abort

    endif

    my_shared_libraries += libdl

  endif

endif