Fix windows SDK build.
Location of hierarchyviewer is now in hierarchyviewer2/app/etc
Change-Id: I14257c96552a16d19461cdf8194045a608dd03b3
diff --git a/build/tools/make_windows_sdk.sh b/build/tools/make_windows_sdk.sh
index 3ceca1f..1154452 100755
--- a/build/tools/make_windows_sdk.sh
+++ b/build/tools/make_windows_sdk.sh
@@ -184,15 +184,15 @@
[[ -n $NEED_MGWZ ]] && cp -v $CYG_MGWZ_PATH "$TOOLS"/
# Update a bunch of bat files
- cp -v sdk/files/post_tools_install.bat "$LIB"/
- cp -v sdk/files/find_java.bat "$LIB"/
- cp -v sdk/apkbuilder/etc/apkbuilder.bat "$TOOLS"/
- cp -v sdk/ddms/app/etc/ddms.bat "$TOOLS"/
- cp -v sdk/traceview/etc/traceview.bat "$TOOLS"/
- cp -v sdk/hierarchyviewer/etc/hierarchyviewer.bat "$TOOLS"/
- cp -v sdk/layoutopt/app/etc/layoutopt.bat "$TOOLS"/
- cp -v sdk/draw9patch/etc/draw9patch.bat "$TOOLS"/
- cp -v sdk/sdkmanager/app/etc/android.bat "$TOOLS"/
+ cp -v sdk/files/post_tools_install.bat "$LIB"/
+ cp -v sdk/files/find_java.bat "$LIB"/
+ cp -v sdk/apkbuilder/etc/apkbuilder.bat "$TOOLS"/
+ cp -v sdk/ddms/app/etc/ddms.bat "$TOOLS"/
+ cp -v sdk/traceview/etc/traceview.bat "$TOOLS"/
+ cp -v sdk/hierarchyviewer2/app/etc/hierarchyviewer.bat "$TOOLS"/
+ cp -v sdk/layoutopt/app/etc/layoutopt.bat "$TOOLS"/
+ cp -v sdk/draw9patch/etc/draw9patch.bat "$TOOLS"/
+ cp -v sdk/sdkmanager/app/etc/android.bat "$TOOLS"/
# Put the JetCreator tools, content and docs (not available in the linux SDK)
JET="$TOOLS/Jet"
diff --git a/build/tools/patch_windows_sdk.sh b/build/tools/patch_windows_sdk.sh
index c28c9d9..5b3c348 100755
--- a/build/tools/patch_windows_sdk.sh
+++ b/build/tools/patch_windows_sdk.sh
@@ -50,15 +50,15 @@
[[ -n $NEED_MGWZ ]] && cp $V $CYG_MGWZ_PATH $TOOLS/
# Update a bunch of bat files
-cp $V ${TOPDIR}sdk/files/post_tools_install.bat $LIB/
-cp $V ${TOPDIR}sdk/files/find_java.bat $LIB/
-cp $V ${TOPDIR}sdk/apkbuilder/etc/apkbuilder.bat $TOOLS/
-cp $V ${TOPDIR}sdk/ddms/app/etc/ddms.bat $TOOLS/
-cp $V ${TOPDIR}sdk/traceview/etc/traceview.bat $TOOLS/
-cp $V ${TOPDIR}sdk/hierarchyviewer/etc/hierarchyviewer.bat $TOOLS/
-cp $V ${TOPDIR}sdk/layoutopt/app/etc/layoutopt.bat $TOOLS/
-cp $V ${TOPDIR}sdk/draw9patch/etc/draw9patch.bat $TOOLS/
-cp $V ${TOPDIR}sdk/sdkmanager/app/etc/android.bat $TOOLS/
+cp $V ${TOPDIR}sdk/files/post_tools_install.bat $LIB/
+cp $V ${TOPDIR}sdk/files/find_java.bat $LIB/
+cp $V ${TOPDIR}sdk/apkbuilder/etc/apkbuilder.bat $TOOLS/
+cp $V ${TOPDIR}sdk/ddms/app/etc/ddms.bat $TOOLS/
+cp $V ${TOPDIR}sdk/traceview/etc/traceview.bat $TOOLS/
+cp $V ${TOPDIR}sdk/hierarchyviewer2/app/etc/hierarchyviewer.bat $TOOLS/
+cp $V ${TOPDIR}sdk/layoutopt/app/etc/layoutopt.bat $TOOLS/
+cp $V ${TOPDIR}sdk/draw9patch/etc/draw9patch.bat $TOOLS/
+cp $V ${TOPDIR}sdk/sdkmanager/app/etc/android.bat $TOOLS/
# Put the JetCreator tools, content and docs (not available in the linux SDK)
JET=$TOOLS/Jet
