Project import generated by Copybara.

PiperOrigin-RevId: 267280553
2019-09-04 19:10:42 -07:00
parent af67642055
commit dc9216dc59
57 changed files with 0 additions and 582 deletions
@@ -93,10 +93,6 @@ ndk_path_line=$((ndk_block+2))'i'
 sdk_block=$(grep -n 'android_sdk_repository(' $workspace_file | awk -F  ":" '{print $1}')
 sdk_path_line=$((sdk_block+3))'i'

-<<<<<<< HEAD
-git checkout $workspace_file
-=======
->>>>>>> Project import generated by Copybara.
 if [ $platform == "darwin" ]; then
  sed -i -e "$ndk_path_line\\
  \ \ \ \ path = \"${android_ndk_path}/android-ndk-${ndk_version}\",