Fix the path for findbugs.

Change-Id: I45485f1aeaf7fc3db2839f42829278d8c0ec97e3

diff --git a/core/Makefile b/core/Makefile
index 68b76ec..9e10417 100644 (file)
--- a/core/Makefile
+++ b/core/Makefile
@@ -1644,11 +1644,11 @@ INTERNAL_FINDBUGS_XML_TARGET := $(PRODUCT_OUT)/findbugs.xml
 INTERNAL_FINDBUGS_HTML_TARGET := $(PRODUCT_OUT)/findbugs.html
 $(INTERNAL_FINDBUGS_XML_TARGET): $(ALL_FINDBUGS_FILES)
        @echo UnionBugs: $@
-       $(hide) prebuilt/common/findbugs/bin/unionBugs $(ALL_FINDBUGS_FILES) \
+       $(hide) $(FINDBUGS_DIR)/unionBugs $(ALL_FINDBUGS_FILES) \
        > $@
 $(INTERNAL_FINDBUGS_HTML_TARGET): $(INTERNAL_FINDBUGS_XML_TARGET)
        @echo ConvertXmlToText: $@
-       $(hide) prebuilt/common/findbugs/bin/convertXmlToText -html:fancy.xsl \
+       $(hide) $(FINDBUGS_DIR)/convertXmlToText -html:fancy.xsl \
        $(INTERNAL_FINDBUGS_XML_TARGET) > $@
 
 # -----------------------------------------------------------------

diff --git a/core/config.mk b/core/config.mk
index cc0e19f..79d5985 100644 (file)
--- a/core/config.mk
+++ b/core/config.mk
@@ -407,7 +407,8 @@ ACP := $(BUILD_OUT_EXECUTABLES)/acp$(BUILD_EXECUTABLE_SUFFIX)
 # dx is java behind a shell script; no .exe necessary.
 DX := $(HOST_OUT_EXECUTABLES)/dx
 ZIPALIGN := $(HOST_OUT_EXECUTABLES)/zipalign$(HOST_EXECUTABLE_SUFFIX)
-FINDBUGS := prebuilt/common/findbugs/bin/findbugs
+FINDBUGS_DIR := external/owasp/sanitizer/tools/findbugs/bin
+FINDBUGS := $(FINDBUGS_DIR)/findbugs
 EMMA_JAR := external/emma/lib/emma$(COMMON_JAVA_PACKAGE_SUFFIX)
 
 # Tool to merge AndroidManifest.xmls

diff --git a/core/java.mk b/core/java.mk
index 824ae6a..ac481ee 100644 (file)
--- a/core/java.mk
+++ b/core/java.mk
@@ -504,7 +504,7 @@ $(LOCAL_MODULE)-findbugs : $(findbugs_html)
 $(findbugs_html) : $(findbugs_xml)
        @mkdir -p $(dir $@)
        @echo ConvertXmlToText: $@
-       $(hide) prebuilt/common/findbugs/bin/convertXmlToText -html:fancy.xsl $(PRIVATE_XML_FILE) \
+       $(hide) $(FINDBUGS_DIR)/convertXmlToText -html:fancy.xsl $(PRIVATE_XML_FILE) \
        > $@
 
 $(LOCAL_MODULE)-findbugs : $(findbugs_html)