diff options
Diffstat (limited to 'core/config.mk')
| -rw-r--r-- | core/config.mk | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/core/config.mk b/core/config.mk index ab60701..facf37c 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) @@ -493,7 +491,7 @@ endif DEFAULT_JACK_EXTRA_ARGS += --verbose error JILL := java -Xmx3500m -jar $(JILL_JAR) -PROGUARD := external/proguard/bin/proguard.sh +PROGUARD := /usr/bin/proguard JAVATAGS := build/tools/java-event-log-tags.py LLVM_RS_CC := $(HOST_OUT_EXECUTABLES)/llvm-rs-cc$(HOST_EXECUTABLE_SUFFIX) BCC_COMPAT := $(HOST_OUT_EXECUTABLES)/bcc_compat$(HOST_EXECUTABLE_SUFFIX) @@ -514,14 +512,13 @@ DX := $(HOST_OUT_EXECUTABLES)/dx ZIPALIGN := $(HOST_OUT_EXECUTABLES)/zipalign$(HOST_EXECUTABLE_SUFFIX) # relocation packer -RELOCATION_PACKER := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/relocation_packer/relocation_packer +RELOCATION_PACKER := $(HOST_OUT_EXECUTABLES)/relocation_packer$(HOST_EXECUTABLE_SUFFIX) -FINDBUGS_DIR := external/owasp/sanitizer/tools/findbugs/bin -FINDBUGS := $(FINDBUGS_DIR)/findbugs -EMMA_JAR := external/emma/lib/emma$(COMMON_JAVA_PACKAGE_SUFFIX) +FINDBUGS := /usr/bin/findbugs +EMMA_JAR := /usr/share/java/emma$(COMMON_JAVA_PACKAGE_SUFFIX) # Tool to merge AndroidManifest.xmls -ANDROID_MANIFEST_MERGER := java -classpath prebuilts/devtools/tools/lib/manifest-merger.jar com.android.manifmerger.Main merge +ANDROID_MANIFEST_MERGER := java -classpath /usr/share/java/com.android.tools.build.manifest-merger.jar:/usr/share/java/com.android.tools.common.jar:/usr/share/java/androidsdk-sdklib.jar com.android.manifmerger.Main merge YACC_HEADER_SUFFIX:= .hpp @@ -736,7 +733,7 @@ endif ifneq ($(CM_BUILD),) ## We need to be sure the global selinux policies are included ## last, to avoid accidental resetting by device configs -$(eval include vendor/cm/sepolicy/sepolicy.mk) +$(eval include vendor/replicant/sepolicy/sepolicy.mk) # Include any vendor specific config.mk file -include $(TOPDIR)vendor/*/build/core/config.mk |