Merge "Monkey: Set the name of the process to distinguish from generic name (app_process)"
diff --git a/apps/Development/src/com/android/development/PackageSummary.java b/apps/Development/src/com/android/development/PackageSummary.java
index 58ab0f7..d621d4e 100644
--- a/apps/Development/src/com/android/development/PackageSummary.java
+++ b/apps/Development/src/com/android/development/PackageSummary.java
@@ -251,7 +251,7 @@
private final static void setItemText(Button item, PackageInfo pi,
String className)
{
- item.setText(className.substring(pi.packageName.length()+1));
+ item.setText(className.substring(className.lastIndexOf('.')+1));
}
private final class ActivityOnClick implements View.OnClickListener
diff --git a/build/tools/patch_windows_sdk.sh b/build/tools/patch_windows_sdk.sh
index 1f3b5bd..1a76817 100755
--- a/build/tools/patch_windows_sdk.sh
+++ b/build/tools/patch_windows_sdk.sh
@@ -15,8 +15,6 @@
echo "Instead, found: ${PLATFORMS[@]}"
exit 1
fi
-THE_PLATFORM=${PLATFORMS[0]}
-PLATFORM_TOOLS=$THE_PLATFORM/tools
# Package USB Driver
if [[ -n "$USB_DRIVER_HOOK" ]]; then
@@ -25,6 +23,7 @@
# Remove obsolete stuff from tools & platform
TOOLS=$TEMP_SDK_DIR/tools
+PLATFORM_TOOLS=$TEMP_SDK_DIR/platform-tools
LIB=$TEMP_SDK_DIR/tools/lib
rm $V $TOOLS/{adb,android,apkbuilder,ddms,dmtracedump,draw9patch,emulator,etc1tool}
rm $V $TOOLS/{hierarchyviewer,hprof-conv,layoutopt,mksdcard,sqlite3,traceview,zipalign}