diff options
| author | Risan <risan@google.com> | 2018-01-24 02:24:16 +0900 |
|---|---|---|
| committer | Risan <risan@google.com> | 2018-01-24 02:24:16 +0900 |
| commit | ceaad1adcb0547f40a078d123ecc832c8f5b9aa1 (patch) | |
| tree | fbed956fd66d8b34e9f3a47aee8ddd0c0e1e4689 | |
| parent | 0ea99099aca4428fee146a3f8d869d687e2c72ed (diff) | |
| download | libmojo-ceaad1adcb0547f40a078d123ecc832c8f5b9aa1.tar.gz | |
Fix libmojo's incompatible mac bash scriptandroid-wear-8.0.0_r1
The real cause seems to be that Mac's bash script doesn't recognize "+"
in regex comparison, but it recognizes "\+".
Bug: 27569341
Test: Compiled successfully on Mac
Change-Id: I74398f3aaf080b80c823b3bba3e5563604620a8d
| -rwxr-xr-x | soong/mojom_source_generator.sh | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/soong/mojom_source_generator.sh b/soong/mojom_source_generator.sh index c14a689..5420b99 100755 --- a/soong/mojom_source_generator.sh +++ b/soong/mojom_source_generator.sh @@ -92,14 +92,7 @@ for file in "${files[@]}"; do "${mojom_bindings_generator}" generate -o "${output_dir}" "${args[@]}" \ --typemap="${typemap}" --bytecode_path="${bytecode_path}" \ --generators=${generators} "${file}" - if [[ "${generators}" =~ .*c++.* ]] ; then - # TODO(risan): These are HACKS, remove it. It creates shared - # sources and headers that are for some reason not generated by - # darwin targets. Should consider to write go plugins so we don't - # need to explicitly list generated mojom output. - touch "${output_dir}/${rel_path}-shared.h" - touch "${output_dir}/${rel_path}-shared-internal.h" - touch "${output_dir}/${rel_path}-shared.cc" + if [[ "${generators}" =~ .*c\+\+.* ]] ; then "${mojom_bindings_generator}" generate -o "${output_dir}" \ --generate_non_variant_code "${args[@]}" --typemap="${typemap}" \ --bytecode_path="${bytecode_path}" --generators=${generators} \ |