[fuchsia] fix build scripts for new arch names
Change-Id: Ia34be3c4a32159229102a490c9df9494a4e32d42
diff --git a/Tools/fuchsia/build_jsc.sh b/Tools/fuchsia/build_jsc.sh
index c38267a..754c824 100755
--- a/Tools/fuchsia/build_jsc.sh
+++ b/Tools/fuchsia/build_jsc.sh
@@ -76,7 +76,7 @@
$ZIRCON_TOOLCHAINS/x86_64-elf-5.3.0-Darwin-x86_64/bin/x86_64-elf-strip $JSC -o $JSC_STRIPPED
-$ZIRCON_ROOT/build-zircon-pc-x86-64/tools/mkbootfs -o $JSCFS $MANIFEST_FILE
+$ZIRCON_ROOT/build-x86/tools/mkbootfs -o $JSCFS $MANIFEST_FILE
if [ $run_after_building == true ] ; then
$ZIRCON_ROOT/scripts/run-zircon-x86-64 -x $JSCFS -m 4096 $debug_options
diff --git a/Tools/fuchsia/build_webkit.sh b/Tools/fuchsia/build_webkit.sh
index b5b5f2d..deb08ac 100755
--- a/Tools/fuchsia/build_webkit.sh
+++ b/Tools/fuchsia/build_webkit.sh
@@ -117,7 +117,7 @@
$ZIRCON_STRIP $MINIBROWSER -o $MINIBROWSER_STRIPPED
$ZIRCON_STRIP $JSC -o $JSC_STRIPPED
- $ZIRCON_MKBOOTFS -c -o $MINIBROWSERFS $FUCHSIA_OUT_DIR/build-zircon/build-zircon-pc-x86-64/bootdata.bin $MANIFEST_FILE
+ $ZIRCON_MKBOOTFS -c -o $MINIBROWSERFS $FUCHSIA_OUT_DIR/build-zircon/build-x86/bootdata.bin $MANIFEST_FILE
fi
if [ $update_prebuilts == true ] ; then
@@ -144,7 +144,7 @@
if [ $os_name == "Darwin" ] ; then
defaults write com.google.fuchsia.FBTV addr2line "$ZIRCON_ROOT/prebuilt/downloads/x86_64-elf-6.2.0-Darwin-x86_64/bin/x86_64-elf-addr2line"
defaults write com.google.fuchsia.FBTV app_name MiniBrowser
- defaults write com.google.fuchsia.FBTV build_dirs -array $WEBKIT_BUILD/bin $WEBKIT_BUILD/lib $FUCHSIA_SYSROOT/lib $ZIRCON_ROOT/build-zircon-pc-x86-64/ulib/musl $ZIRCON_ROOT/build-zircon-pc-x86-64/ulib/driver
+ defaults write com.google.fuchsia.FBTV build_dirs -array $WEBKIT_BUILD/bin $WEBKIT_BUILD/lib $FUCHSIA_SYSROOT/lib $ZIRCON_ROOT/build-x86/ulib/musl $ZIRCON_ROOT/build-x86/ulib/driver
fi
PATH=$FUCHSIA_SRC_ROOT/buildtools/qemu/bin:$PATH $FUCHSIA_SRC_ROOT/scripts/run-zircon-x86-64 -x $MINIBROWSERFS -g $debug_options -q $FUCHSIA_SRC_ROOT/buildtools/qemu/bin
fi
diff --git a/Tools/fuchsia/common.sh b/Tools/fuchsia/common.sh
index 7550f62..43ab31f 100644
--- a/Tools/fuchsia/common.sh
+++ b/Tools/fuchsia/common.sh
@@ -55,13 +55,13 @@
: ${FUCHSIA_ROOT=$default_fuchsia_root} && export FUCHSIA_ROOT
: ${FUCHSIA_BUILDTOOLS=$FUCHSIA_ROOT/buildtools$buildtools_prefix} && export FUCHSIA_BUILDTOOLS
: ${FUCHSIA_TOOLCHAIN=$FUCHSIA_ROOT/buildtools/toolchain/clang+llvm-x86_64-$toolchain_suffix} && export FUCHSIA_TOOLCHAIN
-: ${FUCHSIA_SYSROOT=$FUCHSIA_ROOT/out/build-zircon/build-zircon-pc-x86-64/sysroot} && export FUCHSIA_SYSROOT
+: ${FUCHSIA_SYSROOT=$FUCHSIA_ROOT/out/build-zircon/build-x86/sysroot} && export FUCHSIA_SYSROOT
: ${ZIRCON_ROOT=$FUCHSIA_ROOT/zircon} && export ZIRCON_ROOT
: ${ZIRCON_TOOLCHAINS=$HOME/projects/zircon_toolchains} && export ZIRCON_TOOLCHAINS
: ${WEBKIT_ROOT=$FUCHSIA_ROOT/third_party/webkit} && export WEBKIT_ROOT
: ${ZIRCON_GCC_DIR=$FUCHSIA_ROOT/zircon/prebuilt/downloads/x86_64-elf-6.2.0-$os_name-x86_64/bin} && export ZIRCON_GCC_DIR
: ${ZIRCON_STRIP=$FUCHSIA_ROOT/zircon/prebuilt/downloads/x86_64-elf-6.2.0-$os_name-x86_64/bin/x86_64-elf-strip} && export ZIRCON_STRIP
-: ${ZIRCON_MKBOOTFS=$FUCHSIA_ROOT/zircon/build-zircon-pc-x86-64/tools/mkbootfs} && export ZIRCON_MKBOOTFS
+: ${ZIRCON_MKBOOTFS=$FUCHSIA_ROOT/zircon/build-x86/tools/mkbootfs} && export ZIRCON_MKBOOTFS
: ${FUCHSIA_OUT_DIR=$FUCHSIA_ROOT/out} && export FUCHSIA_OUT_DIR
: ${FUCHSIA_ARCH_OUT_DIR=$FUCHSIA_OUT_DIR/$build_tag-x86-64} && export FUCHSIA_ARCH_OUT_DIR
: ${WM_DEPS_SOURCE_DIR=$FUCHSIA_OUT_DIR/wmdepsrc} && export WM_DEPS_SOURCE_DIR
