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

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

Issue 281303003: Generate gm/Android.mk, minus JSON. (Closed) Base URL: https://skia.googlesource.com/skia.git@baseline_gm
Patch Set: Remove one more generated file Created 6 years, 7 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 | « gyp/gm.gyp ('k') | platform_tools/android/gyp_gen/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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 137
138 tool_makefile_writer.generate_tool(gyp_dir=tmp_folder, 138 tool_makefile_writer.generate_tool(gyp_dir=tmp_folder,
139 target_file='bench.gyp', 139 target_file='bench.gyp',
140 skia_trunk=target_dir, 140 skia_trunk=target_dir,
141 dest_dir='bench', 141 dest_dir='bench',
142 skia_lib_var_dict=common, 142 skia_lib_var_dict=common,
143 local_module_name='skia_bench', 143 local_module_name='skia_bench',
144 local_module_tags=['tests'], 144 local_module_tags=['tests'],
145 place_in_local_tmp=True) 145 place_in_local_tmp=True)
146 146
147 tool_makefile_writer.generate_tool(gyp_dir=tmp_folder,
148 target_file='gm.gyp',
149 skia_trunk=target_dir,
150 dest_dir='gm',
151 skia_lib_var_dict=common,
152 local_module_name='skia_gm',
153 local_module_tags=['optional'])
154
147 # Now that the defines have been written to SkUserConfig and they've been 155 # Now that the defines have been written to SkUserConfig and they've been
148 # used to skip adding them to the tools makefiles, they are not needed in 156 # used to skip adding them to the tools makefiles, they are not needed in
149 # Android.mk. Reset DEFINES. 157 # Android.mk. Reset DEFINES.
150 common.DEFINES.reset() 158 common.DEFINES.reset()
151 159
152 # Further trim arm_neon_var_dict with arm_var_dict. After this call, 160 # Further trim arm_neon_var_dict with arm_var_dict. After this call,
153 # arm_var_dict (which will now be the intersection) includes all definitions 161 # arm_var_dict (which will now be the intersection) includes all definitions
154 # used by both arm and arm + neon, and arm_neon_var_dict will only contain 162 # used by both arm and arm + neon, and arm_neon_var_dict will only contain
155 # those specific to arm + neon. 163 # those specific to arm + neon.
156 arm_var_dict = vars_dict_lib.intersect([arm_var_dict, arm_neon_var_dict]) 164 arm_var_dict = vars_dict_lib.intersect([arm_var_dict, arm_neon_var_dict])
(...skipping 17 matching lines...) Expand all
174 'arm64')) 182 'arm64'))
175 183
176 makefile_writer.write_android_mk(target_dir=target_dir, 184 makefile_writer.write_android_mk(target_dir=target_dir,
177 common=common, deviations_from_common=deviations_from_common) 185 common=common, deviations_from_common=deviations_from_common)
178 186
179 finally: 187 finally:
180 shutil.rmtree(tmp_folder) 188 shutil.rmtree(tmp_folder)
181 189
182 if __name__ == '__main__': 190 if __name__ == '__main__':
183 main() 191 main()
OLDNEW
« no previous file with comments | « gyp/gm.gyp ('k') | platform_tools/android/gyp_gen/makefile_writer.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698