From 5bb7b967fe724e5112762a0e751635056b7bfb77 Mon Sep 17 00:00:00 2001
From: Zhizhou Yang <zhizhouy@google.com>
Date: Tue, 17 Oct 2017 18:22:31 -0700
Subject: [PATCH] Fix patch for Android.bp in art/compiler

Flags was not able to be added to the patch because of the change of
Android.bp in art/compiler. Fix it by re-generate the patch.

Test: Dex2oat benchmark run successfully on both internal and aosp
branch.

Change-Id: I0fbc10650c4d37e2026297e2bf202024604332c9
---
 Dex2oat_flags_aosp.diff     | 13 +++++++------
 Dex2oat_flags_internal.diff | 13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Dex2oat_flags_aosp.diff b/Dex2oat_flags_aosp.diff
index fcd611f8..4da8b2c8 100644
--- a/Dex2oat_flags_aosp.diff
+++ b/Dex2oat_flags_aosp.diff
@@ -1,13 +1,14 @@
 diff --git a/compiler/Android.bp b/compiler/Android.bp
-index a1269dcaf..a9b62b474 100644
+index 1e4cdf2bd..e14dce8d7 100644
 --- a/compiler/Android.bp
 +++ b/compiler/Android.bp
-@@ -215,6 +215,8 @@ art_cc_defaults {
-     shared: {
-         shared_libs: ["libcrypto"],
-     },
+@@ -197,6 +197,9 @@ art_cc_defaults {
+         "art_cmdlineparser_headers",  // For compiler_options.
+     ],
+ 
 +    cflags: [CFLAGS_FOR_BENCH_SUITE],
 +    ldflags: [LDFLAGS_FOR_BENCH_SUITE],
++
+     export_include_dirs: ["."],
  }
  
- gensrcs {
diff --git a/Dex2oat_flags_internal.diff b/Dex2oat_flags_internal.diff
index fcd611f8..2efb1205 100644
--- a/Dex2oat_flags_internal.diff
+++ b/Dex2oat_flags_internal.diff
@@ -1,13 +1,14 @@
 diff --git a/compiler/Android.bp b/compiler/Android.bp
-index a1269dcaf..a9b62b474 100644
+index 1e4cdf2bd5..e14dce8d7b 100644
 --- a/compiler/Android.bp
 +++ b/compiler/Android.bp
-@@ -215,6 +215,8 @@ art_cc_defaults {
-     shared: {
-         shared_libs: ["libcrypto"],
-     },
+@@ -197,6 +197,9 @@ art_cc_defaults {
+         "art_cmdlineparser_headers",  // For compiler_options.
+     ],
+ 
 +    cflags: [CFLAGS_FOR_BENCH_SUITE],
 +    ldflags: [LDFLAGS_FOR_BENCH_SUITE],
++
+     export_include_dirs: ["."],
  }
  
- gensrcs {
-- 
GitLab