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

Side by Side Diff: build/android/setup.gyp

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, 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 unified diff | Download patch
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'conditions': [ 5 'conditions': [
6 ['component == "shared_library"', { 6 ['android_libcpp_library == "c++_shared"', {
7 'targets': [ 7 'targets': [
8 { 8 {
9 # These libraries from the Android ndk are required to be packaged wit h 9 # These libraries from the Android ndk are required to be packaged wit h
10 # any APK that is built with them. build/java_apk.gypi expects any 10 # any APK that is built with them. build/java_apk.gypi expects any
11 # libraries that should be packaged with the apk to be in 11 # libraries that should be packaged with the apk to be in
12 # <(SHARED_LIB_DIR) 12 # <(SHARED_LIB_DIR)
13 'target_name': 'copy_system_libraries', 13 'target_name': 'copy_system_libraries',
14 'type': 'none', 14 'type': 'none',
15 'copies': [ 15 'copies': [
16 { 16 {
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 'action': [ 102 'action': [
103 'python', 'gyp/find_sun_tools_jar.py', 103 'python', 'gyp/find_sun_tools_jar.py',
104 '--output', '<(found_jar_path)', 104 '--output', '<(found_jar_path)',
105 ], 105 ],
106 }, 106 },
107 ], 107 ],
108 }, # sun_tools_java 108 }, # sun_tools_java
109 ] 109 ]
110 } 110 }
111 111
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698