From 0b6a638e00c542338b28015c63e9ebab2704488f Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Fri, 10 Mar 2017 09:38:35 +0000
Subject: [PATCH] When profiles are requested, also generate then for
 non-prebuild.

Test: test-art-host-run-test-debug-no-prebuild-optimizing-no-relocate-ntrace-cms-checkjni-picimage-npictest-ndebuggable-638-checker-inline-caches
Change-Id: Ib9243d453b723eda894f98a0fd25cea155251003
---
 test/etc/run-test-jar | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index de1625641..e4e571cbc 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -522,6 +522,16 @@ mkdir_locations="${DEX_LOCATION}/dalvik-cache/$ISA"
 strip_cmdline="true"
 sync_cmdline="true"
 
+if [ "$PROFILE" = "y" ]; then
+  profman_cmdline="${ANDROID_ROOT}/bin/profman  \
+    --apk=$DEX_LOCATION/$TEST_NAME.jar \
+    --dex-location=$DEX_LOCATION/$TEST_NAME.jar \
+    --create-profile-from=$DEX_LOCATION/profile \
+    --reference-profile-file=$DEX_LOCATION/$TEST_NAME.prof"
+  COMPILE_FLAGS="${COMPILE_FLAGS} --profile-file=$DEX_LOCATION/$TEST_NAME.prof"
+  FLAGS="${FLAGS} -Xcompiler-option --profile-file=$DEX_LOCATION/$TEST_NAME.prof"
+fi
+
 
 if [ "$PREBUILD" = "y" ]; then
   mkdir_locations="${mkdir_locations} ${DEX_LOCATION}/oat/$ISA"
@@ -541,15 +551,6 @@ if [ "$PREBUILD" = "y" ]; then
     dex2oat_cmdline="${dex2oat_cmdline} --instruction-set-features=${INSTRUCTION_SET_FEATURES}"
   fi
 
-  if [ "$PROFILE" = "y" ]; then
-    profman_cmdline="${ANDROID_ROOT}/bin/profman  \
-      --apk=$DEX_LOCATION/$TEST_NAME.jar \
-      --dex-location=$DEX_LOCATION/$TEST_NAME.jar \
-      --create-profile-from=$DEX_LOCATION/profile \
-      --reference-profile-file=$TEST_NAME.prof"
-    dex2oat_cmdline="${dex2oat_cmdline} --profile-file=$TEST_NAME.prof"
-  fi
-
   # Add in a timeout. This is important for testing the compilation/verification time of
   # pathological cases.
   # Note: as we don't know how decent targets are (e.g., emulator), only do this on the host for
-- 
2.11.0