Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(370)

Unified Diff: build/java_apk.gypi

Issue 1263713005: Link libc++_shared with asan=1 on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: added a comment Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/common.gypi ('k') | chrome/android/chrome_apk.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index ff837c38e71ec8f75fcf3ab7bcc08de79023ea35..a1fc8574db67ca4e21145a2d2205ae5c263f8ba4 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -247,7 +247,7 @@
'additional_R_text_files': ['<(intermediate_dir)/R.txt'],
},
}],
- ['native_lib_target != "" and component == "shared_library"', {
+ ['native_lib_target != "" and android_must_copy_system_libraries == 1', {
'dependencies': [
'<(DEPTH)/build/android/setup.gyp:copy_system_libraries',
],
« no previous file with comments | « build/common.gypi ('k') | chrome/android/chrome_apk.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698