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

Unified Diff: platform_tools/chromeos/bin/build_skia_in_chroot

Issue 17684002: Remove no longer needed stuff from chromeos build script, always run gyp (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 6 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: platform_tools/chromeos/bin/build_skia_in_chroot
===================================================================
--- platform_tools/chromeos/bin/build_skia_in_chroot (revision 9745)
+++ platform_tools/chromeos/bin/build_skia_in_chroot (working copy)
@@ -31,22 +31,7 @@
exit 1;
fi
-
-# TODO(borenet): Add these to the tarball, so we don't have to copy.
-# Copy missing headers and libraries into the sysroot.
borenet 2013/06/25 15:27:55 These were added to the tarball, so we no longer n
-if [[ ${GENERIC_BOARD_TYPE} == "amd64-generic" ]];
-then
- LIB_DIR="lib64"
-else
- LIB_DIR="lib"
-fi
-if ! [[ -f "${SYSROOT}/usr/include/GL/glu.h" ]]; then
- cp platform_tools/chromeos/toolchain/${GENERIC_BOARD_TYPE}/usr/include/GL/glu.h ${SYSROOT}/usr/include/GL
-fi
-if ! [[ -f "${SYSROOT}/usr/${LIB_DIR}/libGLU.so" ]]; then
- cp platform_tools/chromeos/toolchain/${GENERIC_BOARD_TYPE}/usr/${LIB_DIR}/libGLU.so* ${SYSROOT}/usr/${LIB_DIR}
-fi
-
+python gyp_skia
make ${makeVars}
returnVal=$?
if [ $returnVal != 0 ]
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698