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

Commit 993655b8 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Use xmllint built from source" am: 063e6b29 

am: 41d79327

Change-Id: Iab0948ce48bd63591fefede07669f129d990835c
parents ffffefd7 41d79327

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -580,6 +580,7 @@ MAKEPARALLEL := $(prebuilt_build_tools_bin)/makeparallel 
SOONG_JAVAC_WRAPPER := $(SOONG_HOST_OUT_EXECUTABLES)/soong_javac_wrapper

SOONG_ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/soong_zip

MERGE_ZIPS := $(SOONG_HOST_OUT_EXECUTABLES)/merge_zips

XMLLINT := $(SOONG_HOST_OUT_EXECUTABLES)/xmllint

ZIP2ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/zip2zip

ZIPTIME := $(prebuilt_build_tools_bin)/ziptime

core/definitions.mk

+2 −2
Original line number Diff line number Diff line
@@ -2686,9 +2686,9 @@ endef 
# $(1): source file

# $(2): destination file, must end with .xml.

define copy-xml-file-checked

$(2): $(1)

$(2): $(1) $(XMLLINT)

	@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)

endef