Merge "Fix ADB, and a typo in BoardConfig.mk"
diff --git a/envsetup.sh b/envsetup.sh
index 4e40175..1443760 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -126,12 +126,12 @@
export ANDROID_PRODUCT_OUT=$(get_abs_build_var PRODUCT_OUT)
export OUT=$ANDROID_PRODUCT_OUT
+ unset ANDROID_HOST_OUT
+ export ANDROID_HOST_OUT=$(get_abs_build_var HOST_OUT)
+
# needed for building linux on MacOS
# TODO: fix the path
#export HOST_EXTRACFLAGS="-I "$T/system/kernel_headers/host_include
-
- # needed for OProfile to post-process collected samples
- export OPROFILE_EVENTS_DIR=$prebuiltdir/oprofile
}
function printconfig()