Skip to content
Snippets Groups Projects
Commit 5bb7b967 authored by Zhizhou Yang's avatar Zhizhou Yang
Browse files

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
parent 73fd86bf
No related branches found
No related tags found
No related merge requests found
diff --git a/compiler/Android.bp b/compiler/Android.bp diff --git a/compiler/Android.bp b/compiler/Android.bp
index a1269dcaf..a9b62b474 100644 index 1e4cdf2bd..e14dce8d7 100644
--- a/compiler/Android.bp --- a/compiler/Android.bp
+++ b/compiler/Android.bp +++ b/compiler/Android.bp
@@ -215,6 +215,8 @@ art_cc_defaults { @@ -197,6 +197,9 @@ art_cc_defaults {
shared: { "art_cmdlineparser_headers", // For compiler_options.
shared_libs: ["libcrypto"], ],
},
+ cflags: [CFLAGS_FOR_BENCH_SUITE], + cflags: [CFLAGS_FOR_BENCH_SUITE],
+ ldflags: [LDFLAGS_FOR_BENCH_SUITE], + ldflags: [LDFLAGS_FOR_BENCH_SUITE],
+
export_include_dirs: ["."],
} }
gensrcs {
diff --git a/compiler/Android.bp b/compiler/Android.bp diff --git a/compiler/Android.bp b/compiler/Android.bp
index a1269dcaf..a9b62b474 100644 index 1e4cdf2bd5..e14dce8d7b 100644
--- a/compiler/Android.bp --- a/compiler/Android.bp
+++ b/compiler/Android.bp +++ b/compiler/Android.bp
@@ -215,6 +215,8 @@ art_cc_defaults { @@ -197,6 +197,9 @@ art_cc_defaults {
shared: { "art_cmdlineparser_headers", // For compiler_options.
shared_libs: ["libcrypto"], ],
},
+ cflags: [CFLAGS_FOR_BENCH_SUITE], + cflags: [CFLAGS_FOR_BENCH_SUITE],
+ ldflags: [LDFLAGS_FOR_BENCH_SUITE], + ldflags: [LDFLAGS_FOR_BENCH_SUITE],
+
export_include_dirs: ["."],
} }
gensrcs {
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment