diff options
| author | Zhizhou Yang <zhizhouy@google.com> | 2017-12-14 04:13:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-14 04:13:21 +0000 |
| commit | 0c04a81d4269011242ef9fcf2a7ba5240c943b7d (patch) | |
| tree | d1664be7d55317c0916926bae44912e7f50ddaf4 /Dex2oat_flags_internal.diff | |
| parent | 1c4c608ea6fcb31256774954ac6bddfd3232c78d (diff) | |
| parent | 15861f6aa97aa54aef9d5fbb81bed2a2a46fe98e (diff) | |
| download | benchmark-0c04a81d4269011242ef9fcf2a7ba5240c943b7d.tar.gz | |
Merge "Update diff files which break benchmark suite" am: 8e6687fd5e am: 4d0421beb2
am: 15861f6aa9
Change-Id: Ic0696d6c3db0f65c8df865055d125e20dda45ffd
Diffstat (limited to 'Dex2oat_flags_internal.diff')
| -rw-r--r-- | Dex2oat_flags_internal.diff | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Dex2oat_flags_internal.diff b/Dex2oat_flags_internal.diff index 2efb1205..a52a67f7 100644 --- a/Dex2oat_flags_internal.diff +++ b/Dex2oat_flags_internal.diff @@ -1,14 +1,14 @@ diff --git a/compiler/Android.bp b/compiler/Android.bp -index 1e4cdf2bd5..e14dce8d7b 100644 +index fe0f3c75c5..d0430bcd55 100644 --- a/compiler/Android.bp +++ b/compiler/Android.bp -@@ -197,6 +197,9 @@ art_cc_defaults { - "art_cmdlineparser_headers", // For compiler_options. +@@ -199,6 +199,9 @@ art_cc_defaults { ], + export_include_dirs: ["."], ++ + cflags: [CFLAGS_FOR_BENCH_SUITE], + ldflags: [LDFLAGS_FOR_BENCH_SUITE], -+ - export_include_dirs: ["."], } + gensrcs { |