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

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

Issue 1415413005: Revert of [Android] Add a configurable environment for devil/. (RELAND) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
« no previous file with comments | « build/android/pylintrc ('k') | build/android/test_runner.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ['android_must_copy_system_libraries == 1', { 6 ['android_must_copy_system_libraries == 1', {
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
(...skipping 24 matching lines...) Expand all
35 'gyp/util/build_device.py', 35 'gyp/util/build_device.py',
36 'gyp/get_device_configuration.py', 36 'gyp/get_device_configuration.py',
37 ], 37 ],
38 'outputs': [ 38 'outputs': [
39 '<(build_device_config_path)', 39 '<(build_device_config_path)',
40 '<(build_device_config_path).fake', 40 '<(build_device_config_path).fake',
41 ], 41 ],
42 'action': [ 42 'action': [
43 'python', 'gyp/get_device_configuration.py', 43 'python', 'gyp/get_device_configuration.py',
44 '--output=<(build_device_config_path)', 44 '--output=<(build_device_config_path)',
45 '--output-directory=<(PRODUCT_DIR)',
46 ], 45 ],
47 } 46 }
48 ], 47 ],
49 }, 48 },
50 { 49 {
51 # Target for creating common output build directories. Creating output 50 # Target for creating common output build directories. Creating output
52 # dirs beforehand ensures that build scripts can assume these folders to 51 # dirs beforehand ensures that build scripts can assume these folders to
53 # exist and there are no race conditions resulting from build scripts 52 # exist and there are no race conditions resulting from build scripts
54 # trying to create these directories. 53 # trying to create these directories.
55 # The build/java.gypi target depends on this target. 54 # The build/java.gypi target depends on this target.
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 'action': [ 102 'action': [
104 'python', 'gyp/find_sun_tools_jar.py', 103 'python', 'gyp/find_sun_tools_jar.py',
105 '--output', '<(found_jar_path)', 104 '--output', '<(found_jar_path)',
106 ], 105 ],
107 }, 106 },
108 ], 107 ],
109 }, # sun_tools_java 108 }, # sun_tools_java
110 ] 109 ]
111 } 110 }
112 111
OLDNEW
« no previous file with comments | « build/android/pylintrc ('k') | build/android/test_runner.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698