Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-releasepie-platform-releasepie-cuttlefish-testing

Change-Id: Ie5f55913845aac5280da5f845ea09edcc8807216

1 files changed, 8 insertions, 0 deletions

diff --git a/soong/mojom_source_generator.sh b/soong/mojom_source_generator.sh
index f1fac9e..a63b8a0 100755
--- a/soong/mojom_source_generator.sh
+++ b/soong/mojom_source_generator.sh
@@ -71,6 +71,10 @@ for arg in "$@"; do
     --generators=*)
       generators="${arg#'--generators='}"
       ;;
+    --srcjar=*)
+      srcjar="${arg#'--srcjar='}"
+      srcjar="$(get_abs_path ${srcjar})"
+      ;;
     --*)
       args=("${args[@]}" "${arg}")
       ;;
@@ -110,3 +114,7 @@ for file in "${files[@]}"; do
     unzip -qo -d "${output_dir}"/src "${output_dir}/${rel_path}".srcjar
   fi
 done
+
+if [[ -n "${srcjar}" ]] ; then
+  (cd "${output_dir}/src" && find . -name '*.java' -print | zip "${srcjar}" -@)
+fi