diff options
| author | Risan <risan@google.com> | 2018-01-29 07:20:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-29 07:20:57 +0000 |
| commit | 23451915dd091e1e62b8aef1db1317e94e16a93c (patch) | |
| tree | 2910e4f541ede53f1dd6072e5753d6bd3f00243d | |
| parent | 2ba28a6860febe144b872d425fb7c3f17c8b9dc2 (diff) | |
| parent | 8be45534d66b01d230b49eafb24c5df8323e15af (diff) | |
| download | libmojo-23451915dd091e1e62b8aef1db1317e94e16a93c.tar.gz | |
Allow variable numbers of typemap in mojo generations am: 7db3d20fd6
am: 8be45534d6
Change-Id: Icd61b9d49514cb11f8bced7886a91b8ac15613d7
| -rwxr-xr-x | soong/mojom_source_generator.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/soong/mojom_source_generator.sh b/soong/mojom_source_generator.sh index 5420b99..bf78fab 100755 --- a/soong/mojom_source_generator.sh +++ b/soong/mojom_source_generator.sh @@ -61,6 +61,7 @@ for arg in "$@"; do --typemap=*) typemap="${arg#'--typemap='}" typemap="$(get_abs_path ${typemap})" + args=("${args[@]}" "--typemap=${typemap}") ;; --bytecode_path=*) bytecode_path="${arg#'--bytecode_path='}" @@ -90,11 +91,11 @@ for file in "${files[@]}"; do mkdir -p "${output_dir}/${rel_dir}" "${mojom_bindings_generator}" generate -o "${output_dir}" "${args[@]}" \ - --typemap="${typemap}" --bytecode_path="${bytecode_path}" \ + --bytecode_path="${bytecode_path}" \ --generators=${generators} "${file}" if [[ "${generators}" =~ .*c\+\+.* ]] ; then "${mojom_bindings_generator}" generate -o "${output_dir}" \ - --generate_non_variant_code "${args[@]}" --typemap="${typemap}" \ + --generate_non_variant_code "${args[@]}" \ --bytecode_path="${bytecode_path}" --generators=${generators} \ "${file}" fi |