platform_tools/chromeos/bin/build_skia_in_chroot - Issue 17684002: Remove no longer needed stuff from chromeos build script, always run gyp

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 #!/bin/bash	1 #!/bin/bash

2	2

3 # This script builds Skia inside of a ChromeOS chroot. It is intended to be run	3 # This script builds Skia inside of a ChromeOS chroot. It is intended to be run

4 # either while inside the chroot or indirectly by running chromeos_make which	4 # either while inside the chroot or indirectly by running chromeos_make which

5 # enters the chroot and runs this script.	5 # enters the chroot and runs this script.

6	6

7 makeVars=""	7 makeVars=""

8 deviceID=""	8 deviceID=""

9	9

10 while (( "$#" )); do	10 while (( "$#" )); do

(...skipping 13 matching lines...) Expand all Loading...
24	24

25 source $SCRIPT_DIR/chromeos_setup.sh	25 source $SCRIPT_DIR/chromeos_setup.sh

26	26

27 setup_device $deviceID	27 setup_device $deviceID

28 returnVal=$?	28 returnVal=$?

29 if [ $returnVal != 0 ]	29 if [ $returnVal != 0 ]

30 then	30 then

31 exit 1;	31 exit 1;

32 fi	32 fi

33	33

34	34 python gyp_skia

35 # TODO(borenet): Add these to the tarball, so we don't have to copy.

36 # 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 These were added to the tarball, so we no longer need to cpy them around.
37 if [[ ${GENERIC_BOARD_TYPE} == "amd64-generic" ]];

38 then

39 LIB_DIR="lib64"

40 else

41 LIB_DIR="lib"

42 fi

43 if ! [[ -f "${SYSROOT}/usr/include/GL/glu.h" ]]; then

44 cp platform_tools/chromeos/toolchain/${GENERIC_BOARD_TYPE}/usr/include/GL/glu. h ${SYSROOT}/usr/include/GL

45 fi

46 if ! [[ -f "${SYSROOT}/usr/${LIB_DIR}/libGLU.so" ]]; then

47 cp platform_tools/chromeos/toolchain/${GENERIC_BOARD_TYPE}/usr/${LIB_DIR}/libG LU.so* ${SYSROOT}/usr/${LIB_DIR}

48 fi

49

50 make ${makeVars}	35 make ${makeVars}

51 returnVal=$?	36 returnVal=$?

52 if [ $returnVal != 0 ]	37 if [ $returnVal != 0 ]

53 then	38 then

54 exit 1;	39 exit 1;

55 fi	40 fi

OLD	NEW

« no previous file with comments | « no previous file | no next file » | no next file with comments »