Chromium Code Reviews| Index: sync_build_test.sh |
| diff --git a/sync_build_test.sh b/sync_build_test.sh |
| index ce19479e92f2d33bf833777280ec16243a89e7d9..c2972fb165666151a5a1b5333a6e9476157f2ef1 100755 |
| --- a/sync_build_test.sh |
| +++ b/sync_build_test.sh |
| @@ -81,7 +81,9 @@ DEFINE_string top "" \ |
| DEFINE_boolean withdev ${FLAGS_TRUE} "Build development packages" |
| DEFINE_boolean usepkg ${FLAGS_TRUE} "Use binary packages" |
| DEFINE_boolean unittest ${FLAGS_TRUE} "Run unit tests" |
| - |
| +DEFINE_string chrome_root "" \ |
|
kmixter1
2010/07/16 06:08:17
abc order
|
| + "The root of your chrome browser source. Should contain a 'src' subdir. \ |
| +If this is set, chrome browser will be built from source." |
| # Returns a heuristic indicating if we believe this to be a google internal |
| # development environment. |
| @@ -126,6 +128,11 @@ function validate_and_set_param_defaults() { |
| FLAGS_force_make_chroot=${FLAGS_TRUE} |
| fi |
| + # If chrome_root option passed, set as option for ./enter_chroot |
| + if [[ ${FLAGS_chrome_root} ]]; then |
|
kmixter1
2010/07/16 06:08:17
-n "${FLAGS_chrome_root}"
|
| + chroot_options="--chrome_root=${FLAGS_chrome_root}" |
| + fi |
| + |
| if [[ -z "${FLAGS_repo}" ]]; then |
| if is_google_environment; then |
| FLAGS_repo="ssh://git@chromiumos-git//chromeos" |
| @@ -360,7 +367,8 @@ function run_phase() { |
| function run_phase_in_chroot() { |
| local desc="$1" |
| shift |
| - run_phase "${desc}" ./enter_chroot.sh "--chroot=${FLAGS_chroot}" -- "$@" |
| + run_phase "${desc}" ./enter_chroot.sh "--chroot=${FLAGS_chroot}" \ |
| + ${chroot_options} -- "$@" |
| } |
| @@ -532,6 +540,12 @@ function main() { |
| run_phase_in_chroot "Running unit tests" ./run_tests.sh ${board_param} |
| fi |
| fi |
| + |
| + if [[ ${FLAGS_chrome_root} ]]; then |
| + run_phase_in_chroot "Building Chromium browser" \ |
| + USE="build_tests" FEATURES="-usersandbox" \ |
| + CHROME_ORIGIN=LOCAL_SOURCE emerge-${FLAGS_board} chromeos-chrome |
| + fi |
| if [[ ${FLAGS_master} -eq ${FLAGS_TRUE} ]]; then |
| chdir_relative src/scripts |