Merge "Stop packaging obsolete OTA tools." am: b98fa19703 am: e82ea963e8
am: 2867533add

* commit '2867533add946cd9d2294ed3b4976f5ecf7aa76e':
  Stop packaging obsolete OTA tools.
diff --git a/core/Makefile b/core/Makefile
index a177b42..db9bd91 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1452,14 +1452,11 @@
   fi
 endef
 
-built_ota_tools := \
-    $(call intermediates-dir-for,EXECUTABLES,applypatch,,,$(TARGET_PREFER_32_BIT))/applypatch \
-    $(call intermediates-dir-for,EXECUTABLES,sqlite3,,,$(TARGET_PREFER_32_BIT))/sqlite3
+built_ota_tools :=
 
 # We can't build static executables when SANITIZE_TARGET=address
 ifeq ($(strip $(SANITIZE_TARGET)),)
 built_ota_tools += \
-    $(call intermediates-dir-for,EXECUTABLES,applypatch_static,,,$(TARGET_PREFER_32_BIT))/applypatch_static \
     $(call intermediates-dir-for,EXECUTABLES,updater,,,$(TARGET_PREFER_32_BIT))/updater
 endif