AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove no longer needed stuff from chromeos build script, always run gyp

Browse Source 
(RunBuilders:Test-ChromeOS-Alex-GMA3150-x86-Debug,Test-ChromeOS-Alex-GMA3150-x86-Release,Perf-ChromeOS-Alex-GMA3150-x86-Release)

R=djsollen@google.com

Author: borenet@google.com

Review URL: https://chromiumcodereview.appspot.com/17684002

git-svn-id: http://skia.googlecode.com/svn/trunk@9752 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2013-06-25 18:18:07 +00:00
parent 9a70f347c9
commit 2c47505671
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
platform_tools/chromeos/bin/build_skia_in_chroot
View File

@ -31,22 +31,7 @@ then
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.
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 ]