commit a780c6b65f92a60ff96da8895f4b8d23483283e3
author Pirama Arumuga Nainar <pirama@google.com> Fri Jan 19 00:46:46 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 19 00:46:46 2018 +0000
tree ce2a59ef1dd5c48e58ea931e1631786fb1e7ec9f
parent 0d413f64984775f0e719d186bccfbd388a745d17
parent c89013cd10cf508cab8f36e8b8925cd0b0464dac

Merge "Update PGO configuration"

compiler/Android.bp

diff --git a/compiler/Android.bp b/compiler/Android.bp
index d4d72f3..01f761b 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -252,9 +252,8 @@
 
     pgo: {
         instrumentation: true,
-        profile_file: "dex2oat.profdata",
+        profile_file: "art/dex2oat.profdata",
         benchmarks: ["dex2oat"],
-        enable_profile_use: false,
     }
 }
 

dex2oat/Android.bp

diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp
index dc71b9b..3a6c86d 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -132,9 +132,8 @@
 
     pgo: {
         instrumentation: true,
-        profile_file: "dex2oat.profdata",
+        profile_file: "art/dex2oat.profdata",
         benchmarks: ["dex2oat"],
-        enable_profile_use: false,
         cflags: [
             // Ignore frame-size increase resulting from instrumentation.
             "-Wno-frame-larger-than=",

dexlayout/Android.bp

diff --git a/dexlayout/Android.bp b/dexlayout/Android.bp
index 4f5d810..23ad5fd 100644
--- a/dexlayout/Android.bp
+++ b/dexlayout/Android.bp
@@ -37,9 +37,8 @@
 
     pgo: {
         instrumentation: true,
-        profile_file: "dex2oat.profdata",
+        profile_file: "art/dex2oat.profdata",
         benchmarks: ["dex2oat"],
-        enable_profile_use: false,
     }
 }