commit 52cde7d10948ad11781d64d1d8a28ec758c7c1d5
author Jeff Hao <jeffhao@google.com> Mon Jul 31 13:35:01 2017 -0700
committer Mathieu Chartier <mathieuc@google.com> Thu Aug 10 15:52:31 2017 -0700
tree c5442773a4bd10e038417f1c2cd4774c0a34684e
parent 478f94ba7fbe6fca03de1a3817a8bd93e95466e3

Add dirty_image_objects file.

Allows grouping of classes with dirty static fields to be grouped
together in the image to have fewer dirty pages.

Bug: 62554875
Test: mm test-art-host

(cherry picked from commit 37641ae54ab72509276d0fdd3f0fabeea9988c4a)

Change-Id: Ibc30b13edb9554f79df86e98253ae318a5ece342

core/jni/AndroidRuntime.cpp

diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index 1ad8541..5afd067 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -814,6 +814,12 @@
             addOption("-Ximage-compiler-option");
             addOption("--compiled-classes=/system/etc/compiled-classes");
         }
+
+        // If there is a dirty-image-objects file, push it.
+        if (hasFile("/system/etc/dirty-image-objects")) {
+            addOption("-Ximage-compiler-option");
+            addOption("--dirty-image-objects=/system/etc/dirty-image-objects");
+        }
     }
 
     property_get("dalvik.vm.image-dex2oat-flags", dex2oatImageFlagsBuf, "");