commit f2e2af8d5548fbb373e52b4cd79a891e46fa9918
author Mathieu Chartier <mathieuc@google.com> Wed Jul 12 21:09:57 2017 -0700
committer Mathieu Chartier <mathieuc@google.com> Wed Jul 12 21:20:45 2017 -0700
tree fb2619128998a22a50ca3ddd7b625dbcfa8004e7
parent da914e73c251a9fe30134d955508db2882add15c

Only enforce profile size limits on target builds

Allow large profiles for non target builds for the case where we are
merging many profiles to generate a boot image profile.

Test: run profman boot image profile on a large set of profiles
Change-Id: Iaacd15d8f0822b419b054b3404dea0d52876abfe

runtime/jit/profile_compilation_info.cc

diff --git a/runtime/jit/profile_compilation_info.cc b/runtime/jit/profile_compilation_info.cc
index 147173c..a247b56 100644
--- a/runtime/jit/profile_compilation_info.cc
+++ b/runtime/jit/profile_compilation_info.cc
@@ -336,7 +336,9 @@
         methods_region_size +
         dex_data.bitmap_storage.size();
   }
-  if (required_capacity > kProfileSizeErrorThresholdInBytes) {
+  // Allow large profiles for non target builds for the case where we are merging many profiles
+  // to generate a boot image profile.
+  if (kIsTargetBuild && required_capacity > kProfileSizeErrorThresholdInBytes) {
     LOG(ERROR) << "Profile data size exceeds "
                << std::to_string(kProfileSizeErrorThresholdInBytes)
                << " bytes. Profile will not be written to disk.";
@@ -1030,8 +1032,9 @@
   if (status != kProfileLoadSuccess) {
     return status;
   }
-
-  if (uncompressed_data_size > kProfileSizeErrorThresholdInBytes) {
+  // Allow large profiles for non target builds for the case where we are merging many profiles
+  // to generate a boot image profile.
+  if (kIsTargetBuild && uncompressed_data_size > kProfileSizeErrorThresholdInBytes) {
     LOG(ERROR) << "Profile data size exceeds "
                << std::to_string(kProfileSizeErrorThresholdInBytes)
                << " bytes";