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

Side by Side Diff: gpu/BUILD.gn

Issue 666813002: GN: Fix Android component build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-clank
Patch Set: Actually undo gyp change Created 6 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
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 # GYP-to-GN project mappings: 5 # GYP-to-GN project mappings:
6 # 6 #
7 # gpu.gyp:command_buffer_client => //gpu/command_buffer/client 7 # gpu.gyp:command_buffer_client => //gpu/command_buffer/client
8 # 8 #
9 # gpu.gyp:command_buffer_common => //gpu/command_buffer/common 9 # gpu.gyp:command_buffer_common => //gpu/command_buffer/common
10 # 10 #
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 "//third_party/angle:translator", 110 "//third_party/angle:translator",
111 "//ui/gfx", 111 "//ui/gfx",
112 "//ui/gfx:test_support", 112 "//ui/gfx:test_support",
113 "//ui/gfx/geometry", 113 "//ui/gfx/geometry",
114 "//ui/gl", 114 "//ui/gl",
115 "//gpu/command_buffer/common:gles2_utils", 115 "//gpu/command_buffer/common:gles2_utils",
116 "//gpu/command_buffer/client:gles2_c_lib", 116 "//gpu/command_buffer/client:gles2_c_lib",
117 "//gpu/command_buffer/client:gles2_implementation_client_side_arrays", 117 "//gpu/command_buffer/client:gles2_implementation_client_side_arrays",
118 ] 118 ]
119 119
120 libs = []
121
122 if (is_android) {
123 deps += [
124 "//testing/android:native_test_native_code",
125 ]
126 libs += [ "android" ]
127 }
120 # TODO(GYP) 128 # TODO(GYP)
121 # ['OS == "android"', {
122 # 'dependencies': [
123 # '../testing/android/native_test.gyp:native_test_native_code',
124 # ],
125 # }],
126 # ['OS == "win"', { 129 # ['OS == "win"', {
127 # 'dependencies': [ 130 # 'dependencies': [
128 # '../third_party/angle/src/build_angle.gyp:libEGL', 131 # '../third_party/angle/src/build_angle.gyp:libEGL',
129 # '../third_party/angle/src/build_angle.gyp:libGLESv2', 132 # '../third_party/angle/src/build_angle.gyp:libGLESv2',
130 # ], 133 # ],
131 # }], 134 # }],
132 } 135 }
133 136
134 test("gpu_unittests") { 137 test("gpu_unittests") {
135 sources = [ 138 sources = [
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 ] 251 ]
249 252
250 deps = [ 253 deps = [
251 "//base", 254 "//base",
252 "//base/third_party/dynamic_annotations", 255 "//base/third_party/dynamic_annotations",
253 "//testing/gmock", 256 "//testing/gmock",
254 "//testing/gtest", 257 "//testing/gtest",
255 "//third_party/angle:translator_static", 258 "//third_party/angle:translator_static",
256 ] 259 ]
257 } 260 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698