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

Commit 4e5df997 authored by Dan Willemsen's avatar Dan Willemsen Committed by Gerrit Code Review
Browse files

Merge "Remove variables exported by Soong"

parents 1ee0fa0d db3bfcea

core/clang/config.mk

+0 −53
Original line number Diff line number Diff line
@@ -22,54 +22,6 @@ RS_CLANG := $(RS_LLVM_PREBUILTS_PATH)/clang$(BUILD_EXECUTABLE_SUFFIX) 
RS_LLVM_AS := $(RS_LLVM_PREBUILTS_PATH)/llvm-as$(BUILD_EXECUTABLE_SUFFIX)

RS_LLVM_LINK := $(RS_LLVM_PREBUILTS_PATH)/llvm-link$(BUILD_EXECUTABLE_SUFFIX)



CLANG_CONFIG_UNKNOWN_CFLAGS := \

  -finline-functions \

  -finline-limit=64 \

  -fno-canonical-system-headers \

  -Wno-clobbered \

  -fno-devirtualize \

  -fno-tree-sra \

  -fprefetch-loop-arrays \

  -funswitch-loops \

  -Werror=unused-but-set-parameter \

  -Werror=unused-but-set-variable \

  -Wmaybe-uninitialized \

  -Wno-error=clobbered \

  -Wno-error=maybe-uninitialized \

  -Wno-error=unused-but-set-parameter \

  -Wno-error=unused-but-set-variable \

  -Wno-free-nonheap-object \

  -Wno-literal-suffix \

  -Wno-maybe-uninitialized \

  -Wno-old-style-declaration \

  -Wno-psabi \

  -Wno-unused-but-set-parameter \

  -Wno-unused-but-set-variable \

  -Wno-unused-local-typedefs \

  -Wunused-but-set-parameter \

  -Wunused-but-set-variable \

  -fdiagnostics-color \

  -mthumb-interwork \

  -fgcse-after-reload \

  -frerun-cse-after-loop \

  -frename-registers \

  -fno-align-jumps \

  -fno-builtin-sin \

  -fno-caller-saves \

  -fno-early-inlining \

  -fno-move-loop-invariants \

  -fno-partial-inlining \

  -fno-strict-volatile-bitfields \

  -fno-tree-copy-prop \

  -fno-tree-loop-optimize \

  -msynci \

  -mno-synci \

  -mno-fused-madd \

  -finline-limit=300 \

  -fno-inline-functions-called-once \

  -mfpmath=sse \

  -mbionic



define convert-to-clang-flags

$(strip $(filter-out $(CLANG_CONFIG_UNKNOWN_CFLAGS),$(1)))

endef
@@ -129,11 +81,6 @@ clang_2nd_arch_prefix := $(TARGET_2ND_ARCH_VAR_PREFIX) 
include $(BUILD_SYSTEM)/clang/TARGET_$(TARGET_2ND_ARCH).mk

endif



ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS := -fno-omit-frame-pointer

ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS := -Wl,-u,__asan_preinit



ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES := libasan



# This allows us to use the superset of functionality that compiler-rt

# provides to Clang (for supporting features like -ftrapv).

COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES := libcompiler_rt-extras

core/config.mk

+0 −15
Original line number Diff line number Diff line
@@ -643,19 +643,6 @@ endif 
# Set up final options.

# ###############################################################



GLOBAL_CFLAGS_NO_OVERRIDE := \

    -Werror=int-to-pointer-cast \

    -Werror=pointer-to-int-cast \



GLOBAL_CLANG_CFLAGS_NO_OVERRIDE := \

    -Werror=address-of-temporary \

    -Werror=return-type \

    # Bug: http://b/29823425 Disable -Wnull-dereference until the new cases

    # detected by this warning in Clang r271374 are fixed.

    #-Werror=null-dereference \



GLOBAL_CPPFLAGS_NO_OVERRIDE :=



# We run gcc/clang with PWD=/proc/self/cwd to remove the $TOP

# from the debug output. That way two builds in two different

# directories will create the same output.
@@ -780,8 +767,6 @@ endif 
RSCOMPAT_32BIT_ONLY_API_LEVELS := 8 9 10 11 12 13 14 15 16 17 18 19 20

RSCOMPAT_NO_USAGEIO_API_LEVELS := 8 9 10 11 12 13



NDK_PREBUILT_SHARED_LIBRARIES := android c dl EGL GLESv1_CM GLESv2 GLESv3 jnigraphics log mediandk m OpenMAXAL OpenSLES stdc++ vulkan z



ifeq ($(JAVA_NOT_REQUIRED),true)

# Remove java and tools from our path so that we make sure nobody uses them.

unexport ANDROID_JAVA_HOME

core/product.mk

+0 −5
Original line number Diff line number Diff line
@@ -290,11 +290,6 @@ _product_stash_var_list += \ 
	WITH_DEXPREOPT \

	WITH_DEXPREOPT_BOOT_IMG_ONLY



_product_stash_var_list += \

	GLOBAL_CFLAGS_NO_OVERRIDE \

	GLOBAL_CPPFLAGS_NO_OVERRIDE \

	GLOBAL_CLANG_CFLAGS_NO_OVERRIDE \



#

# Mark the variables in _product_stash_var_list as readonly

#