diff options
| author | Zhizhou Yang <zhizhouy@google.com> | 2017-10-18 03:41:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-18 03:41:04 +0000 |
| commit | 1c4c608ea6fcb31256774954ac6bddfd3232c78d (patch) | |
| tree | 6143a895b0b65375888f5f1d90cbd7935d31c6e4 | |
| parent | c748ad9284ddddeef2acdf5b51093409f6ac5353 (diff) | |
| parent | f8e70db2d988d8ab04cbc7890d108be05e86e516 (diff) | |
| download | benchmark-1c4c608ea6fcb31256774954ac6bddfd3232c78d.tar.gz | |
Fix patch for Android.bp in art/compiler am: 5bb7b967fe am: 95500d7427 am: e3b6739b06
am: f8e70db2d9
Change-Id: Idb6a3aa8eea9edeadaa66a86fbba05e5cecfc766
| -rw-r--r-- | Dex2oat_flags_aosp.diff | 13 | ||||
| -rw-r--r-- | 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 { |