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

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: . Created 5 years, 5 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
Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index ff837c38e71ec8f75fcf3ab7bcc08de79023ea35..a83ef4df9e6d4e724c4c23e3fbc8281b464b4fdd 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_libcpp_library == "c++_shared"', {
'dependencies': [
'<(DEPTH)/build/android/setup.gyp:copy_system_libraries',
],

Powered by Google App Engine
This is Rietveld 408576698