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

Side by Side Diff: platform_tools/android/bin/gyp_to_android.py

Issue 366653002: Specify the name of tool for creating a makefile. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 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 unified diff | Download patch
« no previous file with comments | « no previous file | platform_tools/android/gyp_gen/tool_makefile_writer.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 #!/usr/bin/python 1 #!/usr/bin/python
2 2
3 # Copyright 2014 Google Inc. 3 # Copyright 2014 Google Inc.
4 # 4 #
5 # Use of this source code is governed by a BSD-style license that can be 5 # Use of this source code is governed by a BSD-style license that can be
6 # found in the LICENSE file. 6 # found in the LICENSE file.
7 7
8 """ 8 """
9 Script for generating the Android framework's version of Skia from gyp 9 Script for generating the Android framework's version of Skia from gyp
10 files. 10 files.
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 original_sk_user_config=user_config, 130 original_sk_user_config=user_config,
131 require_sk_user_config=require_sk_user_config, target_dir=dst_dir, 131 require_sk_user_config=require_sk_user_config, target_dir=dst_dir,
132 ordered_set=common.DEFINES) 132 ordered_set=common.DEFINES)
133 133
134 tool_makefile_writer.generate_tool(gyp_dir=tmp_folder, 134 tool_makefile_writer.generate_tool(gyp_dir=tmp_folder,
135 target_file='tests.gyp', 135 target_file='tests.gyp',
136 skia_trunk=target_dir, 136 skia_trunk=target_dir,
137 dest_dir='tests', 137 dest_dir='tests',
138 skia_lib_var_dict=common, 138 skia_lib_var_dict=common,
139 local_module_name='skia_test', 139 local_module_name='skia_test',
140 local_module_tags=['tests']) 140 local_module_tags=['tests'],
141 desired_targets=['tests'])
141 142
142 tool_makefile_writer.generate_tool(gyp_dir=tmp_folder, 143 tool_makefile_writer.generate_tool(gyp_dir=tmp_folder,
143 target_file='bench.gyp', 144 target_file='bench.gyp',
144 skia_trunk=target_dir, 145 skia_trunk=target_dir,
145 dest_dir='bench', 146 dest_dir='bench',
146 skia_lib_var_dict=common, 147 skia_lib_var_dict=common,
147 local_module_name='skia_bench', 148 local_module_name='skia_bench',
148 local_module_tags=['tests'], 149 local_module_tags=['tests'],
150 desired_targets=['bench'],
149 place_in_local_tmp=True) 151 place_in_local_tmp=True)
150 152
151 tool_makefile_writer.generate_tool(gyp_dir=tmp_folder, 153 tool_makefile_writer.generate_tool(gyp_dir=tmp_folder,
152 target_file='gm.gyp', 154 target_file='gm.gyp',
153 skia_trunk=target_dir, 155 skia_trunk=target_dir,
154 dest_dir='gm', 156 dest_dir='gm',
155 skia_lib_var_dict=common, 157 skia_lib_var_dict=common,
156 local_module_name='skia_gm', 158 local_module_name='skia_gm',
157 local_module_tags=['tests']) 159 local_module_tags=['tests'],
160 desired_targets=['gm'])
158 161
159 tool_makefile_writer.generate_tool(gyp_dir=tmp_folder, 162 tool_makefile_writer.generate_tool(gyp_dir=tmp_folder,
160 target_file='dm.gyp', 163 target_file='dm.gyp',
161 skia_trunk=target_dir, 164 skia_trunk=target_dir,
162 dest_dir='dm', 165 dest_dir='dm',
163 skia_lib_var_dict=common, 166 skia_lib_var_dict=common,
164 local_module_name='skia_dm', 167 local_module_name='skia_dm',
165 local_module_tags=['tests']) 168 local_module_tags=['tests'],
169 desired_targets=['dm'])
166 170
167 # Now that the defines have been written to SkUserConfig and they've been 171 # Now that the defines have been written to SkUserConfig and they've been
168 # used to skip adding them to the tools makefiles, they are not needed in 172 # used to skip adding them to the tools makefiles, they are not needed in
169 # Android.mk. Reset DEFINES. 173 # Android.mk. Reset DEFINES.
170 common.DEFINES.reset() 174 common.DEFINES.reset()
171 175
172 # Further trim arm_neon_var_dict with arm_var_dict. After this call, 176 # Further trim arm_neon_var_dict with arm_var_dict. After this call,
173 # arm_var_dict (which will now be the intersection) includes all definitions 177 # arm_var_dict (which will now be the intersection) includes all definitions
174 # used by both arm and arm + neon, and arm_neon_var_dict will only contain 178 # used by both arm and arm + neon, and arm_neon_var_dict will only contain
175 # those specific to arm + neon. 179 # those specific to arm + neon.
(...skipping 21 matching lines...) Expand all
197 'arm64')) 201 'arm64'))
198 202
199 makefile_writer.write_android_mk(target_dir=target_dir, 203 makefile_writer.write_android_mk(target_dir=target_dir,
200 common=common, deviations_from_common=deviations_from_common) 204 common=common, deviations_from_common=deviations_from_common)
201 205
202 finally: 206 finally:
203 shutil.rmtree(tmp_folder) 207 shutil.rmtree(tmp_folder)
204 208
205 if __name__ == '__main__': 209 if __name__ == '__main__':
206 main() 210 main()
OLDNEW
« no previous file with comments | « no previous file | platform_tools/android/gyp_gen/tool_makefile_writer.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698