DO NOT MERGE ANYWHERE -

Broke the build in mnc-dr-dev

Revert "Add system/extras/verity/build_verity_metadata.py  to otatools"

Bug: 29008004

This reverts commit d26a99c3c6903c02c5435ec5f0123f057527b0a9.

Change-Id: Ic56a3d382a48a68f6c6f97684c045ec943be1423

diff --git a/core/Makefile b/core/Makefile
index 44adf08..80fd0fe 100644 (file)
--- a/core/Makefile
+++ b/core/Makefile
@@ -1343,8 +1343,6 @@ $(BUILT_OTATOOLS_PACKAGE): $(OTATOOLS) | $(ACP)
        $(hide) rm -rf $@ $(zip_root)
        $(hide) mkdir -p $(dir $@) $(zip_root)/bin $(zip_root)/framework $(zip_root)/releasetools
        $(call copy-files-with-structure,$(OTATOOLS),$(HOST_OUT)/,$(zip_root))
-       $(hide) $(ACP) $(HOST_OUT_JAVA_LIBRARIES)/VeritySigner.jar $(zip_root)/framework/
-       $(hide) $(ACP) -p system/extras/verity/build_verity_metadata.py $(zip_root)/system/extras/verity/
        $(hide) $(ACP) -r -d -p build/tools/releasetools/* $(zip_root)/releasetools
        $(hide) rm -rf $@ $(zip_root)/releasetools/*.pyc
        $(hide) (cd $(zip_root) && zip -qry $(abspath $@) *)