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

Side by Side Diff: platform_tools/android/gyp/dependencies.gypi

Issue 1774503004: Update android_make to support both --gcc and --clang options. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: better way to handle codec.gyp Created 4 years, 9 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 | « platform_tools/android/bin/utils/setup_toolchain.sh ('k') | src/views/SkView.cpp » ('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 2015 Google Inc. 1 # Copyright 2015 Google Inc.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 # This GYP file stores the dependencies necessary to build Skia on the Android 6 # This GYP file stores the dependencies necessary to build Skia on the Android
7 # platform. The OS doesn't provide many stable libraries as part of the 7 # platform. The OS doesn't provide many stable libraries as part of the
8 # distribution so we have to build a few of them ourselves. 8 # distribution so we have to build a few of them ourselves.
9 # 9 #
10 # NOTE: We tried adding the gyp file to the android/ directory at the root of 10 # NOTE: We tried adding the gyp file to the android/ directory at the root of
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 # all of them). Conditionals inside 'target_conditions' are evaluated 106 # all of them). Conditionals inside 'target_conditions' are evaluated
107 # *after* all other definitions and conditionals are evaluated, so 107 # *after* all other definitions and conditionals are evaluated, so
108 # we're guaranteed that '_type' will be defined when we get here. 108 # we're guaranteed that '_type' will be defined when we get here.
109 # For more info, see: 109 # For more info, see:
110 # - http://code.google.com/p/gyp/wiki/InputFormatReference#Variables 110 # - http://code.google.com/p/gyp/wiki/InputFormatReference#Variables
111 # - http://codereview.appspot.com/6353065/ 111 # - http://codereview.appspot.com/6353065/
112 ['_type == "executable"', { 112 ['_type == "executable"', {
113 'type': 'shared_library', 113 'type': 'shared_library',
114 }], 114 }],
115 ], 115 ],
116 'cflags': [
117 '-Wno-unused-private-field',
118 ],
116 'sources': [ 119 'sources': [
117 '../apps/sample_app/src/main/jni/com_skia_SkiaSampleRenderer.cpp', 120 '../apps/sample_app/src/main/jni/com_skia_SkiaSampleRenderer.cpp',
118 ], 121 ],
119 }, 122 },
120 }, 123 },
121 { 124 {
122 # This target is a dependency for VisualBench application which runs on 125 # This target is a dependency for VisualBench application which runs on
123 # Android. Since Android requires us to load native code in shared 126 # Android. Since Android requires us to load native code in shared
124 # libraries, we need a common entry point to wrap around main(). Here 127 # libraries, we need a common entry point to wrap around main(). Here
125 # we also change the type of all would-be executables to be shared 128 # we also change the type of all would-be executables to be shared
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 # - http://code.google.com/p/gyp/wiki/InputFormatReference#Variables 176 # - http://code.google.com/p/gyp/wiki/InputFormatReference#Variables
174 # - http://codereview.appspot.com/6353065/ 177 # - http://codereview.appspot.com/6353065/
175 ['_type == "executable"', { 178 ['_type == "executable"', {
176 'type': 'shared_library', 179 'type': 'shared_library',
177 }], 180 }],
178 ], 181 ],
179 }, 182 },
180 }, 183 },
181 ] 184 ]
182 } 185 }
OLDNEW
« no previous file with comments | « platform_tools/android/bin/utils/setup_toolchain.sh ('k') | src/views/SkView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698