diff options
| author | Siva Velusamy <vsiva@google.com> | 2013-10-09 15:02:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-09 15:02:49 -0700 |
| commit | aeccc7000290f3f2edc59f9ff3a941df0d37ebc3 (patch) | |
| tree | 75eb9d385574ac32d9196bd422fceea2d43f5df8 /build/tools | |
| parent | 44d4d905bf6da9d38cb4695962335c9c8b4a38ad (diff) | |
| parent | 777285ceedba8cda5fb0fe0843fae6a887522c03 (diff) | |
| download | android_development-aeccc7000290f3f2edc59f9ff3a941df0d37ebc3.tar.gz android_development-aeccc7000290f3f2edc59f9ff3a941df0d37ebc3.tar.bz2 android_development-aeccc7000290f3f2edc59f9ff3a941df0d37ebc3.zip | |
am 777285ce: Merge "samples: Do not attempt to clean line endings for *.py"
* commit '777285ceedba8cda5fb0fe0843fae6a887522c03':
samples: Do not attempt to clean line endings for *.py
Diffstat (limited to 'build/tools')
| -rwxr-xr-x | build/tools/sdk_clean.sh | 11 |
1 files 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 |