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
This commit is contained in:
Siva Velusamy
2013-10-09 15:02:49 -07:00
committed by Android Git Automerger

View File

@@ -1,8 +1,6 @@
#!/bin/bash #!/bin/bash
# #
# This script processes a set of files given as arguments as sample code to be released # This script cleans up a set of files given as arguments for release in the SDK
# in the SDK.
#
# Note that these files are modified in-place. # Note that these files are modified in-place.
# #
@@ -32,7 +30,7 @@ find $DIR -name "*.java" -o -name "*.xml" | xargs -n 1 \
fi 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 if [ $HOST_OS = windows ] ; then
ENDING_TYPE=dos ENDING_TYPE=dos
@@ -40,9 +38,8 @@ else
ENDING_TYPE=unix ENDING_TYPE=unix
fi fi
find $DIR -name "*.aidl" -o -name "*.css" -o -name "*.html" -o -name "*.java" \ find $DIR -name "*.aidl" -o -name "*.css" -o -name "*.html" -o -name "*.java" \
-o -name "*.js" -o -name "*.prop" -o -name "*.py" \ -o -name "*.js" -o -name "*.prop" -o -name "*.template" \
-o -name "*.template" -o -name "*.txt" -o -name "*.windows" \ -o -name "*.txt" -o -name "*.windows" -o -name "*.xml" \
-o -name "*.xml" \
| xargs $HOST_OUT_EXECUTABLES/line_endings $ENDING_TYPE | xargs $HOST_OUT_EXECUTABLES/line_endings $ENDING_TYPE