diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-18 08:10:38 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-18 08:10:38 +0000 |
| commit | fc9e47fcceeb73bef1f0f883d30be9637ae6fec3 (patch) | |
| tree | 6143a895b0b65375888f5f1d90cbd7935d31c6e4 | |
| parent | fbc896846e5cf657327472656fb67cf486ce73bf (diff) | |
| parent | 1c4c608ea6fcb31256774954ac6bddfd3232c78d (diff) | |
| download | benchmark-fc9e47fcceeb73bef1f0f883d30be9637ae6fec3.tar.gz | |
Snap for 4402171 from 1c4c608ea6fcb31256774954ac6bddfd3232c78d to pi-release
Change-Id: Ib88fcc67c165006ab51c26d1b54311cf5e679b8c
| -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 { |