diff options
author | Ryo Hashimoto <hashimoto@google.com> | 2018-06-21 10:49:41 +0900 |
---|---|---|
committer | Ryo Hashimoto <hashimoto@google.com> | 2018-06-21 10:52:41 +0900 |
commit | 7435fbe37e14eee2dbd1535197217109b3da61ec (patch) | |
tree | 74208c2dad70ede794a3bc1e6bb78bc1d40ed3a5 | |
parent | fd75f2cd95d4c37cb9ee3cc1c95a367b34b3da3c (diff) | |
download | libmojo-android-9.0.0_r33.tar.gz |
DO NOT MERGE Add --srcjar option to mojom_source_generator.shandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-devpie-b4s4-releasepie-b4s4-dev
This is essentially a cherry-pick of
https://android-review.googlesource.com/c/699550.
Bug: 110444246
Test: build
Change-Id: I7579f91c760a6b4380861390109a12298da2703d
-rwxr-xr-x | soong/mojom_source_generator.sh | 8 |
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 |