diff options
| author | 2023-09-26 22:34:12 +0000 | |
|---|---|---|
| committer | 2023-09-26 22:34:12 +0000 | |
| commit | 1a4a3a4dcfdcbc5216decb34ad6a2cc83d9a8fe3 (patch) | |
| tree | b636a3d6d5b58e6e57e8b29301a72079e8177f55 | |
| parent | 3b167877a142c43e98f23afef509af7bc0e9a5c4 (diff) | |
| parent | dee600b9bdeccafaff5811d2c66077271b522d60 (diff) | |
Merge "Handle grep finds no matches." into main am: dee600b9bd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2745856
Change-Id: Ib478de512743d6079682495b45df1bd05d46b391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | mime/Android.bp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mime/Android.bp b/mime/Android.bp index a3ea65cb2efe..757862b998b4 100644 --- a/mime/Android.bp +++ b/mime/Android.bp @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - package { // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import @@ -125,6 +124,6 @@ java_genrule { srcs: [ "java-res/vendor.mime.types", ], - // strip comments normalize whitepace drop empty lines prepend ? to fields that are missing it - cmd: "awk '{gsub(/#.*$$/,\"\"); $$1=$$1; print;}' $(in) | grep ' ' | awk '{for(i=1;i<=NF;i++) { sub(/^\\??/, \"?\", $$i); }; print}' > $(out)", + // strip comments normalize whitepace drop empty lines prepend ? to fields that are missing it + cmd: "awk '{gsub(/#.*$$/,\"\"); $$1=$$1; print;}' $(in) | (grep ' ' || echo -n '') | awk '{for(i=1;i<=NF;i++) { sub(/^\\??/, \"?\", $$i); }; print}' > $(out)", } |