diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-06-25 18:18:07 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-06-25 18:18:07 +0000 |
| commit | 2c47505671ad13be967cda8f3a64c26e46296370 (patch) | |
| tree | 0132d4c533cfc0d378d0acc6d9de7e1bd38d9feb /platform_tools | |
| parent | 9a70f347c9f279bf7b4ad8f24e78e3e524767ed5 (diff) | |
Remove no longer needed stuff from chromeos build script, always run gyp
(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
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/chromeos/bin/build_skia_in_chroot | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/platform_tools/chromeos/bin/build_skia_in_chroot b/platform_tools/chromeos/bin/build_skia_in_chroot index cfad89a1a4..b585d76a53 100755 --- a/platform_tools/chromeos/bin/build_skia_in_chroot +++ b/platform_tools/chromeos/bin/build_skia_in_chroot @@ -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 ] |