commit 58b7ddc2bc109409e68c37146c945f980b913d00
author hamzeh <hamzeh@google.com> Sat Jul 27 21:52:16 2019 -0700
committer Hamzeh Zawawy <hamzeh@google.com> Sun Jul 28 19:47:23 2019 +0000
tree e8dae696b44dd6d6bb3b4ccebef2101bd5828e0d
parent b1a56f399634b5f76c1b2571e2fa8131647bc077

Adding a zip file in the haiku make file

Bug: 136479524
Test: generating zip when run locally
Change-Id: Ief63577a4a7d7d5e5f685ecb28f44be8da38dde4

build/tasks/haiku.mk

diff --git a/build/tasks/haiku.mk b/build/tasks/haiku.mk
index bc20b3c..ca5892e 100644
--- a/build/tasks/haiku.mk
+++ b/build/tasks/haiku.mk
@@ -1,15 +1,6 @@
-my_modules := $(haiku)
-
-my_package_name := haiku
-
-.PHONY: haiku
-
-#haiku : $(my_package_zip)
-
-haiku : \
+my_modules := \
     libexif_parser_fuzzer \
     libopus_fuzzer \
-    mtp_fuzzer \
     simple_test_fuzzer \
     base_json_reader_fuzzer \
     libhevc_fuzzer \
@@ -20,7 +11,14 @@
     libldacBT_enc_fuzzer \
     libutils_fuzzer \
     sanitycheck_fuzzer \
-    libsonivox_fuzzer \
-    tremolo_fuzzer \
-        
-$(call $(my_package_zip):$(name).zip)
+
+my_package_name := haiku
+
+include $(BUILD_SYSTEM)/tasks/tools/package-modules.mk
+
+.PHONY: haiku
+haiku : $(my_package_zip)
+
+name := $(TARGET_PRODUCT)-haiku-$(FILE_NAME_TAG)
+$(call dist-for-goals, haiku, $(my_package_zip):$(name).zip)
+