Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(890)

Unified Diff: runtime/embedders/openglui/build_skia.sh

Issue 15317012: Fix the Skia build for Android. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | runtime/embedders/openglui/openglui_embedder.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/embedders/openglui/build_skia.sh
===================================================================
--- runtime/embedders/openglui/build_skia.sh (revision 22893)
+++ runtime/embedders/openglui/build_skia.sh (working copy)
@@ -61,7 +61,7 @@
if [ ${DO_ANDROID} != 0 ] ; then
echo "Building for Android ${TARGET_ARCH}"
- curl http://skia.googlecode.com/svn/android/gclient.config -o .gclient
+ curl http://skia.googlecode.com/svn/trunk/platform_tools/android/gclient.config -o .gclient
gclient sync
export ANDROID_SDK_ROOT=`readlink -f ../android_tools/sdk`
@@ -71,9 +71,10 @@
echo "Using SDK ${ANDROID_SDK_ROOT}"
if [ ${CLEAN} != 0 ] ; then
- ../android/bin/android_make -d $TARGET_ARCH -j clean
+ ./platform_tools/android/bin/android_make -d $TARGET_ARCH -j clean
else
- env -i BUILDTYPE=$BUILD ANDROID_SDK_ROOT="${ANDROID_SDK_ROOT}" PATH="${PATH}:${GSUTIL_LOCATION}" ../android/bin/android_make BUILDTYPE=$BUILD -d $TARGET_ARCH -j --debug=j
+ echo env -i BUILDTYPE=$BUILD ANDROID_SDK_ROOT="${ANDROID_SDK_ROOT}" PATH="${PATH}:${GSUTIL_LOCATION}" ../android/bin/android_make BUILDTYPE=$BUILD -d $TARGET_ARCH -j --debug=j
+ env -i BUILDTYPE=$BUILD ANDROID_SDK_ROOT="${ANDROID_SDK_ROOT}" PATH="${PATH}:${GSUTIL_LOCATION}" ./platform_tools/android/bin/android_make BUILDTYPE=$BUILD -d $TARGET_ARCH -j --debug=j
fi
else
« no previous file with comments | « no previous file | runtime/embedders/openglui/openglui_embedder.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698