Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57a10b39 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Handle grep finds no matches." into main am: dee600b9 am: 1a4a3a4d... 

Merge "Handle grep finds no matches." into main am: dee600b9 am: 1a4a3a4d am: c5a3a307 am: d38cdb4a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2745856



Change-Id: I39cc89f64555bb64d77968ecab5221f154a153b8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cb71db38 d38cdb4a

mime/Android.bp

+2 −3
Original line number Diff line number Diff line
@@ -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
@@ -126,5 +125,5 @@ java_genrule { 
        "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)",

    cmd: "awk '{gsub(/#.*$$/,\"\"); $$1=$$1; print;}' $(in) | (grep ' ' || echo -n '') | awk '{for(i=1;i<=NF;i++) { sub(/^\\??/, \"?\", $$i); }; print}' > $(out)",

}