commit 42f4090f85cde1a0d87d88e239a21e9780cc10b9
author Andreas Gampe <agampe@google.com> Mon Apr 16 11:21:20 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Apr 16 11:21:20 2018 -0700
tree ac82ce40465c9f909a4524dfde45402fb45ec535
parent 4c024e0917496d22b9e68f5052b9d88bd36aaf0c
parent f6786aeb64c1292d7d3d62ab940d8923257902be

Merge "Revert "Frameworks/base: Compiled-classes support"" am: 087bae3ffe
am: f6786aeb64

Change-Id: I52f22c3df2a0a8d99d7be0d68fbf11eec2de8024

core/jni/AndroidRuntime.cpp

diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index 0f44dae..5ccbaec 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -817,12 +817,6 @@
         addOption("-Ximage-compiler-option");
         addOption("--image-classes=/system/etc/preloaded-classes");
 
-        // If there is a compiled-classes file, push it.
-        if (hasFile("/system/etc/compiled-classes")) {
-            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");