diff options
| -rw-r--r-- | apex/apex_singleton.go | 9 | ||||
| -rw-r--r-- | apex/builder.go | 2 | ||||
| -rw-r--r-- | java/java.go | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/apex/apex_singleton.go b/apex/apex_singleton.go index 00dd44648..d46104e40 100644 --- a/apex/apex_singleton.go +++ b/apex/apex_singleton.go @@ -64,12 +64,14 @@ var ( if grep -v -h '^#' ${allowed_deps_list} | sort -u -f| diff -B -u - ${new_allowed_deps}; then touch ${out}; else - echo -e "\n******************************"; + echo; + echo "******************************"; echo "ERROR: go/apex-allowed-deps-error contains more information"; echo "******************************"; echo "Detected changes to allowed dependencies in updatable modules."; echo "To fix and update packages/modules/common/build/allowed_deps.txt, please run:"; - echo -e "$$ (croot && packages/modules/common/build/update-apex-allowed-deps.sh)\n"; + echo "$$ (croot && packages/modules/common/build/update-apex-allowed-deps.sh)"; + echo; echo "When submitting the generated CL, you must include the following information"; echo "in the commit message if you are adding a new dependency:"; echo "Apex-Size-Increase: Expected binary size increase for affected APEXes (or the size of the .jar / .so file of the new library)"; @@ -78,7 +80,8 @@ var ( echo "Test-Info: What’s the testing strategy for the new dependency? Does it have its own tests, and are you adding integration tests? How/when are the tests run?"; echo "You do not need OWNERS approval to submit the change, but mainline-modularization@"; echo "will periodically review additions and may require changes."; - echo -e "******************************\n"; + echo "******************************"; + echo; exit 1; fi; `, diff --git a/apex/builder.go b/apex/builder.go index 4585cbbe3..d0acc8d6c 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -196,7 +196,7 @@ var ( Command: `diff --unchanged-group-format='' \` + `--changed-group-format='%<' \` + `${image_content_file} ${allowed_files_file} || (` + - `echo -e "New unexpected files were added to ${apex_module_name}." ` + + `echo "New unexpected files were added to ${apex_module_name}." ` + ` "To fix the build run following command:" && ` + `echo "system/apex/tools/update_allowed_list.sh ${allowed_files_file} ${image_content_file}" && ` + `exit 1); touch ${out}`, diff --git a/java/java.go b/java/java.go index 078f578e1..64ef782f5 100644 --- a/java/java.go +++ b/java/java.go @@ -226,9 +226,9 @@ var ( // Rule for generating device binary default wrapper deviceBinaryWrapper = pctx.StaticRule("deviceBinaryWrapper", blueprint.RuleParams{ - Command: `echo -e '#!/system/bin/sh\n` + + Command: `printf '#!/system/bin/sh\n` + `export CLASSPATH=/system/framework/$jar_name\n` + - `exec app_process /$partition/bin $main_class "$$@"'> ${out}`, + `exec app_process /$partition/bin $main_class "$$@"\n'> ${out}`, Description: "Generating device binary wrapper ${jar_name}", }, "jar_name", "partition", "main_class") ) |