From de3fa5df078bc751a5c7640d965ed9c57c1d909f Mon Sep 17 00:00:00 2001 From: Siva Velusamy Date: Wed, 9 Oct 2013 07:42:07 -0700 Subject: [PATCH] samples: Do not attempt to clean line endings for *.py The line endings script changes line endings, but also removes the executable permissions of the files. We don't want this to happen for scripts such as systrace.py Change-Id: I355cbc4c77cfb3c90e4615962863288680389bce --- build/tools/sdk_clean.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/build/tools/sdk_clean.sh b/build/tools/sdk_clean.sh index 467d5605a..a80e6e9d5 100755 --- a/build/tools/sdk_clean.sh +++ b/build/tools/sdk_clean.sh @@ -1,8 +1,6 @@ #!/bin/bash # -# This script processes a set of files given as arguments as sample code to be released -# in the SDK. -# +# This script cleans up a set of files given as arguments for release in the SDK # Note that these files are modified in-place. # @@ -32,7 +30,7 @@ find $DIR -name "*.java" -o -name "*.xml" | xargs -n 1 \ fi # -# Fix up the line endings of all text files +# Fix up the line endings of all text files. This also removes executable permissions. # if [ $HOST_OS = windows ] ; then ENDING_TYPE=dos @@ -40,9 +38,8 @@ else ENDING_TYPE=unix fi find $DIR -name "*.aidl" -o -name "*.css" -o -name "*.html" -o -name "*.java" \ - -o -name "*.js" -o -name "*.prop" -o -name "*.py" \ - -o -name "*.template" -o -name "*.txt" -o -name "*.windows" \ - -o -name "*.xml" \ + -o -name "*.js" -o -name "*.prop" -o -name "*.template" \ + -o -name "*.txt" -o -name "*.windows" -o -name "*.xml" \ | xargs $HOST_OUT_EXECUTABLES/line_endings $ENDING_TYPE