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

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

Issue 691783003: [WIP NOT FOR COMMIT] Switch Android to libc++ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comments Created 6 years, 1 month 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 ['component == "shared_library"', {
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 'conditions': [ 15 'conditions': [
16 ['target_arch=="arm" and arm_thumb==1', { 16 ['target_arch=="arm" and arm_thumb==1', {
17 'copies': [ 17 'copies': [
18 { 18 {
19 'destination': '<(SHARED_LIB_DIR)/', 19 'destination': '<(SHARED_LIB_DIR)/',
20 'files': [ 20 'files': [
21 '<(android_stlport_libs_dir)/thumb/libstlport_shared.so', 21 '<(android_libcpp_libs_dir)/thumb/libc++_shared.so',
22 ], 22 ],
23 }, 23 },
24 ], 24 ],
25 }, { 25 }, {
26 'copies': [ 26 'copies': [
27 { 27 {
28 'destination': '<(SHARED_LIB_DIR)/', 28 'destination': '<(SHARED_LIB_DIR)/',
29 'files': [ 29 'files': [
30 '<(android_stlport_libs_dir)/libstlport_shared.so', 30 '<(android_libcpp_libs_dir)/libc++_shared.so',
31 ], 31 ],
32 }, 32 },
33 ], 33 ],
34 }], 34 }],
35 ], 35 ],
36 }, 36 },
37 ], 37 ],
38 }], 38 }],
39 ], 39 ],
40 'targets': [ 40 'targets': [
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 'mkdir', 86 'mkdir',
87 '-p', 87 '-p',
88 '<@(output_dirs)', 88 '<@(output_dirs)',
89 ], 89 ],
90 }, 90 },
91 ], 91 ],
92 }, # build_output_dirs 92 }, # build_output_dirs
93 ] 93 ]
94 } 94 }
95 95
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698