Skip to content
Snippets Groups Projects
Commit 1c4c608e authored by Zhizhou Yang's avatar Zhizhou Yang Committed by android-build-merger
Browse files

Fix patch for Android.bp in art/compiler am: 5bb7b967 am: 95500d74 am: e3b6739b 

am: f8e70db2

Change-Id: Idb6a3aa8eea9edeadaa66a86fbba05e5cecfc766
parents c748ad92 f8e70db2
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Dex2oat_flags_aosp.diff
+ 7
− 6
View file @ 1c4c608e
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 {
Dex2oat_flags_internal.diff
+ 7
− 6
View file @ 1c4c608e
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% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment