StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use xmllint built from source" am: 063e6b2939 am: 41d79327cd

Browse Source 
am: 993655b8bf

Change-Id: I182feaff6e3db997407affd5520f57b421b8e433
This commit is contained in:
Dan Willemsen
2018-02-27 04:43:13 +00:00
committed by android-build-merger
parent 5bbc56f825 993655b8bf
commit f65052640e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/config.mk
View File

@@ -589,6 +589,7 @@ MAKEPARALLEL := $(prebuilt_build_tools_bin)/makeparallel
SOONG_JAVAC_WRAPPER := $(SOONG_HOST_OUT_EXECUTABLES)/soong_javac_wrapper SOONG_JAVAC_WRAPPER := $(SOONG_HOST_OUT_EXECUTABLES)/soong_javac_wrapper
SOONG_ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/soong_zip SOONG_ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/soong_zip
MERGE_ZIPS := $(SOONG_HOST_OUT_EXECUTABLES)/merge_zips MERGE_ZIPS := $(SOONG_HOST_OUT_EXECUTABLES)/merge_zips
XMLLINT := $(SOONG_HOST_OUT_EXECUTABLES)/xmllint
ZIP2ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/zip2zip ZIP2ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/zip2zip
ZIPTIME := $(prebuilt_build_tools_bin)/ziptime ZIPTIME := $(prebuilt_build_tools_bin)/ziptime

4
core/definitions.mk
View File

@@ -2686,9 +2686,9 @@ endef
# $(1): source file # $(1): source file
# $(2): destination file, must end with .xml. # $(2): destination file, must end with .xml.
define copy-xml-file-checked define copy-xml-file-checked
$(2): $(1) $(2): $(1) $(XMLLINT)
@echo "Copy xml: $$@" @echo "Copy xml: $$@"
$(hide) xmllint $$< >/dev/null # Don't print the xml file to stdout. $(hide) $(XMLLINT) $$< >/dev/null # Don't print the xml file to stdout.
$$(copy-file-to-target) $$(copy-file-to-target)
endef endef