commit 1c4c608ea6fcb31256774954ac6bddfd3232c78d
author Zhizhou Yang <zhizhouy@google.com> Wed Oct 18 03:41:04 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 18 03:41:04 2017 +0000
tree 6143a895b0b65375888f5f1d90cbd7935d31c6e4
parent c748ad9284ddddeef2acdf5b51093409f6ac5353
parent f8e70db2d988d8ab04cbc7890d108be05e86e516

Fix patch for Android.bp in art/compiler am: 5bb7b967fe am: 95500d7427 am: e3b6739b06
am: f8e70db2d9

Change-Id: Idb6a3aa8eea9edeadaa66a86fbba05e5cecfc766

Dex2oat_flags_aosp.diff

diff --git a/Dex2oat_flags_aosp.diff b/Dex2oat_flags_aosp.diff
index fcd611f..4da8b2c 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 {

Dex2oat_flags_internal.diff

diff --git a/Dex2oat_flags_internal.diff b/Dex2oat_flags_internal.diff
index fcd611f..2efb120 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 {