resolved conflicts for merge of d6e32b81 to dalvik-dev

Change-Id: Ib038cc0e68651c63dbcf9a0df2a5607ab2c2d6c7

1 files changed, 17 insertions, 2 deletions

diff --git a/docs/porting-guide.html b/docs/porting-guide.html
index 3e33d13ea..9b02d176d 100644
--- a/docs/porting-guide.html
+++ b/docs/porting-guide.html
@@ -26,8 +26,7 @@ build system is assumed.
 <p>
 The native code in the core libraries (chiefly <code>libcore</code>,
 but also <code>dalvik/vm/native</code>) is written in C/C++ and is expected
-to work without modification in a Linux environment.  Much of the code
-comes directly from the Apache Harmony project.
+to work without modification in a Linux environment.
 </p><p>
 The core libraries pull in code from many other projects, including
 OpenSSL, zlib, and ICU.  These will also need to be ported before the VM
@@ -349,6 +348,22 @@ debugger or toggle profiling.  (A future test suite may include some
 tests for this.)
 </p>
 
+
+<h2>Other Performance Issues</h2>
+
+<p>
+The <code>System.arraycopy()</code> function is heavily used.  The
+implementation relies on the bionic C library to provide a fast,
+platform-optimized data copy function for arrays with elements wider
+than one byte.  If you're not using bionic, or your platform does not
+have an implementation of this method, Dalvik will use correct but
+sub-optimal algorithms instead.  For best performance you will want
+to provide your own version.
+</p><p>
+See the comments in <code>dalvik/vm/native/java_lang_System.c</code>
+for details.
+</p>
+
 <p>
 <address>Copyright &copy; 2009 The Android Open Source Project</address>