From 402a6befc94c9af93df393022bfa20768d6e8070 Mon Sep 17 00:00:00 2001 From: Wolfgang Wiedmeyer Date: Fri, 8 Jan 2016 19:01:38 +0100 Subject: use more prebuilt apps from the host take flex, bison, yasm and findbugs from /usr/bin TODO: cleanup removal of analyzer Signed-off-by: Wolfgang Wiedmeyer --- core/config.mk | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/core/config.mk b/core/config.mk index 36c7ae000..5ebbbc43f 100644 --- a/core/config.mk +++ b/core/config.mk @@ -356,8 +356,6 @@ ifeq ($(strip $(WITH_SYNTAX_CHECK)),0) WITH_SYNTAX_CHECK := endif -# Disable WITH_STATIC_ANALYZER and WITH_SYNTAX_CHECK if tool can't be found -SYNTAX_TOOLS_PREFIX := prebuilts/misc/$(HOST_PREBUILT_TAG)/analyzer/bin ifneq ($(strip $(WITH_STATIC_ANALYZER)),) ifeq ($(wildcard $(SYNTAX_TOOLS_PREFIX)/ccc-analyzer),) $(warning *** Disable WITH_STATIC_ANALYZER because $(SYNTAX_TOOLS_PREFIX)/ccc-analyzer does not exist) @@ -412,16 +410,16 @@ JACK_LAUNCHER_JAR := $(HOST_OUT_JAVA_LIBRARIES)/jack-launcher.jar JILL_JAR := $(HOST_OUT_JAVA_LIBRARIES)/jill.jar JACK_MULTIDEX_DEFAULT_PREPROCESSOR := frameworks/multidex/library/resources/JACK-INF/legacyMultidexInstallation.jpp -LEX := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/flex/flex-2.5.39 +LEX := /usr/bin/flex # The default PKGDATADIR built in the prebuilt bison is a relative path # external/bison/data. # To run bison from elsewhere you need to set up enviromental variable # BISON_PKGDATADIR. BISON_PKGDATADIR := $(PWD)/external/bison/data -BISON := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/bison/bison +BISON := /usr/bin/bison YACC := $(BISON) -d -YASM := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/yasm/yasm +YASM := /usr/bin/yasm DOXYGEN:= doxygen AAPT := $(HOST_OUT_EXECUTABLES)/aapt$(HOST_EXECUTABLE_SUFFIX) @@ -516,8 +514,7 @@ ZIPALIGN := $(HOST_OUT_EXECUTABLES)/zipalign$(HOST_EXECUTABLE_SUFFIX) # relocation packer RELOCATION_PACKER := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/relocation_packer/relocation_packer -FINDBUGS_DIR := external/owasp/sanitizer/tools/findbugs/bin -FINDBUGS := $(FINDBUGS_DIR)/findbugs +FINDBUGS := /usr/bin/findbugs EMMA_JAR := external/emma/lib/emma$(COMMON_JAVA_PACKAGE_SUFFIX) # Tool to merge AndroidManifest.xmls -- cgit v1.2.3