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

Commit 4c36d45a authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Use xmllint built from source 

Instead of relying on whatever version of xmllint is on the host system,
build and use the version in external/libxml2.

Test: diff build_aosp-marlin.ninja, expected changes.
Test: m $(xmllint targets in build_aosp-marlin.ninja)
Test: introduce xml error, build fails
Change-Id: I39579f06db3777e3b5c8dda7c7541c25a35887b2
parent 7998503e

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