Merge commit 'goog/readonly-p4-master'

2009-03-31 21:34:23 -07:00
parent e3a08f2a1f d9b64e1350
commit 3c9e08a9ff
2 changed files with 2 additions and 1 deletions
--- a/core/main.mk
+++ b/core/main.mk
@@ -290,6 +290,7 @@ subdirs := \
 	dalvik/dexdump \
 	dalvik/libdex \
 	dalvik/tools/dmtracedump \
+	dalvik/tools/hprof-conv \
 	development/emulator/mksdcard \
 	development/tools/activitycreator \
 	development/tools/line_endings \
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -975,7 +975,7 @@ function runtest()
 }

 # simple shortcut to the runtest.py command
-function runtest.py()
+function runtest_py()
 {
    T=$(gettop)
    if [ ! "$T" ]; then