merge in jb-mr1-release history after reset to jb-mr1-dev
diff --git a/core/build_id.mk b/core/build_id.mk
index 53e7efd..40bb35d 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -1,4 +1,3 @@
-
#
# Copyright (C) 2008 The Android Open Source Project
#
@@ -14,9 +13,20 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+
+#
+# Defines branch-specific values.
+#
+
# BUILD_ID is usually used to specify the branch name
# (like "MAIN") or a branch name and a release candidate
-# (like "CRB01"). It must be a single word, and is
+# (like "TC1-RC5"). It must be a single word, and is
# capitalized by convention.
+#
+BUILD_ID := MASTER
-export BUILD_ID=JOO88C
+# DISPLAY_BUILD_NUMBER should only be set for development branches,
+# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for
+# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY
+# is the same as BUILD_ID
+DISPLAY_BUILD_NUMBER := true
diff --git a/envsetup.sh b/envsetup.sh
index e5c60cf..3694755 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -937,7 +937,7 @@
shift 2
fi
local adbOptions=${adbTarget}
- echo adbOptions = ${adbOptions}
+ #echo adbOptions = ${adbOptions}
# runhat options
local targetPid=$1
@@ -954,8 +954,11 @@
fi
# issue "am" command to cause the hprof dump
- local devFile=/sdcard/hprof-$targetPid
+ local sdcard=$(adb shell echo -n '$EXTERNAL_STORAGE')
+ local devFile=$sdcard/hprof-$targetPid
+ #local devFile=/data/local/hprof-$targetPid
echo "Poking $targetPid and waiting for data..."
+ echo "Storing data at $devFile"
adb ${adbOptions} shell am dumpheap $targetPid $devFile
echo "Press enter when logcat shows \"hprof: heap dump completed\""
echo -n "> "
