Merge "sdk_clean.sh: the mac is now using the same sed as linux." am: 5502f2c591 am: e8ae12f12a

am: c847d216ca

Change-Id: If23f53cb7d1fbb4a938f35d0d76de3f3558cce69
This commit is contained in:
Elliott Hughes
2019-10-09 17:40:34 -07:00
committed by android-build-merger

View File

@@ -13,21 +13,11 @@ DIR=$1
# changed in the process, making it easier to match 3rd party complaints/questions # changed in the process, making it easier to match 3rd party complaints/questions
# with the source tree. # with the source tree.
# #
# sed on Mac OS takes -i SUFFIX and sed on Linux takes -iSUFFIX
#
if [ $HOST_OS = darwin ] ; then
find $DIR -name "*.java" -o -name "*.xml" | xargs -n 1 \
sed \
-e "s/.*BEGIN_INCLUDE(.*//" \
-e "s/.*END_INCLUDE(.*//" \
-i ""
else
find $DIR -name "*.java" -o -name "*.xml" | xargs -n 1 \ find $DIR -name "*.java" -o -name "*.xml" | xargs -n 1 \
sed \ sed \
-e "s/.*BEGIN_INCLUDE(.*//" \ -e "s/.*BEGIN_INCLUDE(.*//" \
-e "s/.*END_INCLUDE(.*//" \ -e "s/.*END_INCLUDE(.*//" \
-i -i
fi
# #
# Fix up the line endings of all text files. This also removes executable permissions. # Fix up the line endings of all text files. This also removes executable permissions.