Update win_sdk to put binaries in SDK/platform-tools.
This is requires as a follow up to Change I4526310a with moved platform tools from $SDK/platform/*/tools to $SDK/platform-tools/ SDK Bug: 2897406 Change-Id: I1563c88fc824db3d9c86fb65479820989d46895c
This commit is contained in:
@@ -15,8 +15,6 @@ if [[ ${#PLATFORMS[@]} != 1 ]]; then
|
|||||||
echo "Instead, found: ${PLATFORMS[@]}"
|
echo "Instead, found: ${PLATFORMS[@]}"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
THE_PLATFORM=${PLATFORMS[0]}
|
|
||||||
PLATFORM_TOOLS=$THE_PLATFORM/tools
|
|
||||||
|
|
||||||
# Package USB Driver
|
# Package USB Driver
|
||||||
if [[ -n "$USB_DRIVER_HOOK" ]]; then
|
if [[ -n "$USB_DRIVER_HOOK" ]]; then
|
||||||
@@ -25,6 +23,7 @@ fi
|
|||||||
|
|
||||||
# Remove obsolete stuff from tools & platform
|
# Remove obsolete stuff from tools & platform
|
||||||
TOOLS=$TEMP_SDK_DIR/tools
|
TOOLS=$TEMP_SDK_DIR/tools
|
||||||
|
PLATFORM_TOOLS=$TEMP_SDK_DIR/platform-tools
|
||||||
LIB=$TEMP_SDK_DIR/tools/lib
|
LIB=$TEMP_SDK_DIR/tools/lib
|
||||||
rm $V $TOOLS/{adb,android,apkbuilder,ddms,dmtracedump,draw9patch,emulator,etc1tool}
|
rm $V $TOOLS/{adb,android,apkbuilder,ddms,dmtracedump,draw9patch,emulator,etc1tool}
|
||||||
rm $V $TOOLS/{hierarchyviewer,hprof-conv,layoutopt,mksdcard,sqlite3,traceview,zipalign}
|
rm $V $TOOLS/{hierarchyviewer,hprof-conv,layoutopt,mksdcard,sqlite3,traceview,zipalign}
|
||||||
|
|||||||
Reference in New Issue
Block a user