Merge changes I44289a3d,I0537453b,I23a655b1
* changes:
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm)
fs_config_generate: add -P <partitionlist> option
fs_config_generate: unit test
diff --git a/core/main.mk b/core/main.mk
index 4715a11..4e9a901 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -453,8 +453,8 @@
ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android
-# enable vm tracing in files for now to help track
-# the cause of ANRs in the content process
+# Sets the location that the runtime dumps stack traces to when signalled
+# with SIGQUIT. Stack trace dumping is turned on for all android builds.
ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.stack-trace-file=/data/anr/traces.txt
# ------------------------------------------------------------
