Remove bootstrap/env_setup symlinks
Change-Id: I4d0a042818b7f58ea212c7ebbc16db503b225841
diff --git a/bootstrap.sh b/bootstrap.sh
index 6468e7a..ceed8cd 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -51,7 +51,7 @@
# variable set.
# TODO(mohrr) find out a way to do this without PW_CHECKOUT_ROOT.
if test -n "$PW_CHECKOUT_ROOT"; then
- PW_SETUP_SCRIPT_PATH=$(_pw_abspath "$PW_CHECKOUT_ROOT/pw_env_setup/bootstrap.sh")
+ PW_SETUP_SCRIPT_PATH=$(_pw_abspath "$PW_CHECKOUT_ROOT/bootstrap.sh")
unset PW_CHECKOUT_ROOT
# Shell: bash.
elif test -n "$BASH"; then
@@ -71,12 +71,6 @@
PW_ROOT=$(dirname $PW_SETUP_SCRIPT_PATH)
export PW_ROOT
-# TODO(mohrr) remove once recipes are updated.
-if [ $(basename $PW_ROOT) = "pw_env_setup" ]; then
- PW_ROOT=$(dirname $PW_ROOT)
- export PW_ROOT
-fi
-
SETUP_SH="$PW_ROOT/pw_env_setup/.setup.sh"
if [ -z "$PW_ENVSETUP_QUIET" ]; then
diff --git a/pw_env_setup/bootstrap.sh b/pw_env_setup/bootstrap.sh
deleted file mode 120000
index 171e2f9..0000000
--- a/pw_env_setup/bootstrap.sh
+++ /dev/null
@@ -1 +0,0 @@
-../bootstrap.sh
\ No newline at end of file
diff --git a/pw_env_setup/env_setup.sh b/pw_env_setup/env_setup.sh
deleted file mode 120000
index 171e2f9..0000000
--- a/pw_env_setup/env_setup.sh
+++ /dev/null
@@ -1 +0,0 @@
-../bootstrap.sh
\ No newline at end of file