Skip to content

Commit 2133a17

Browse files
ras0219-msftras0219-msft
committed
Use git instead of patch directly to reduce tool dependency
1 parent e83d8b9 commit 2133a17

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

‎Build_android/configure.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626

2727
set -e
2828

29-
# Note: we require android ndk r10 available from
30-
# http://dl.google.com/android/ndk/android-ndk32-r10-linux-x86_64.tar.bz2
31-
# http://dl.google.com/android/ndk/android-ndk32-r10-windows-x86_64.zip
29+
# Note: we require android ndk r10e available from
30+
# http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.tar.bz2
31+
# http://dl.google.com/android/ndk/android-ndk-r10e-windows-x86_64.zip
3232

3333
# -----------------
3434
# Parse args
@@ -184,7 +184,7 @@ then
184184
then
185185
git checkout 1c95d349d5f92c5ac1c24e0ec6985272a3e3883c
186186
git reset --hard HEAD
187-
patch -p1 < "$DIR/boost-for-android.patch"
187+
git apply "$DIR/boost-for-android.patch"
188188
touch cpprestsdk.patched.stamp
189189
fi
190190
PATH="$PATH:$NDK_DIR" ./build-android.sh --boost=1.55.0 --with-libraries=locale,random,date_time,filesystem,system,thread,chrono "${NDK_DIR}" || exit 1
@@ -200,7 +200,7 @@ then
200200
then
201201
git checkout 1c95d349d5f92c5ac1c24e0ec6985272a3e3883c
202202
git reset --hard HEAD
203-
patch -p1 < "$DIR/boost-for-android-x86.patch"
203+
git apply "$DIR/boost-for-android-x86.patch"
204204
ln -s ../Boost-for-Android/boost_1_55_0.tar.bz2 .
205205
touch cpprestsdk.patched.stamp
206206
fi

0 commit comments

Comments
 (0)