commit 24a3c2e9924e8765c4a9b4d383cb8f3b922f9c9f
author Brian Carlstrom <bdc@google.com> Mon Oct 17 18:07:52 2011 -0700
committer Brian Carlstrom <bdc@google.com> Mon Oct 17 18:17:36 2011 -0700
tree 1f61ecb377be4abcba4838651bc9d98b548a3f81
parent 3535c22d05bb4600255db90b490e625eda874b53

ClassLinker changes

- Add ClassLinker::LockOwner for SignalCatcher
- ClassLinker::ResolveMethod now sets CodeAndDirectMethod when code is available

Change-Id: I404b80d1994808e018d00e0b30e8ba4f9d08fecc

Android.mk

diff --git a/Android.mk b/Android.mk
index 4ec396b..a1124ce 100644
--- a/Android.mk
+++ b/Android.mk
@@ -209,6 +209,7 @@
 	cp $(call intermediates-dir-for,SHARED_LIBRARIES,libdvm)/LINKED/libdvm.so $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/libdvm.so
 	cp $(call intermediates-dir-for,EXECUTABLES,dexopt)/dexopt $(TARGET_OUT_EXECUTABLES)/dexopt
 	cp $(call intermediates-dir-for,EXECUTABLES,dexopt)/LINKED/dexopt $(TARGET_OUT_EXECUTABLES_UNSTRIPPED)/dexopt
+	rm -f $(TARGET_OUT_DATA)/property/persist.sys.strictmode.disabled
 	adb shell rm /data/property/persist.sys.strictmode.disabled
 	adb remount
 	adb sync