diff options
| author | 2023-09-27 01:19:15 +0000 | |
|---|---|---|
| committer | 2023-09-27 01:19:15 +0000 | |
| commit | 8dd0f1a5af0dcdbe252db400f692068d5ed56cb7 (patch) | |
| tree | cf529a0b01259388dd2c494504895428a26618e4 | |
| parent | 49a911556b0a996d7f7170a0ff556a43151c048e (diff) | |
| parent | 57a10b3920fa980031d419cdb445f8544531db0f (diff) | |
Merge "Handle grep finds no matches." into main am: dee600b9bd am: 1a4a3a4dcf am: c5a3a307cc am: d38cdb4ae4 am: 57a10b3920
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2745856
Change-Id: I6adf88a9022910376bfbb205363879b86f5dd5a5
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)", } |