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

Side by Side Diff: testing/android/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 import("//build/config/android/rules.gni") 5 import("//build/config/android/rules.gni")
6 6
7 # GYP: //testing/android/native_test.gyp:native_test_native_code 7 # GYP: //testing/android/native_test.gyp:native_test_native_code
8 source_set("native_test_native_code") { 8 source_set("native_test_native_code") {
9 testonly = true 9 testonly = true
10 sources = [ 10 sources = [
11 "native_test_launcher.cc" 11 "native_test_launcher.cc"
12 ] 12 ]
13 libs = [ "log" ]
13 deps = [ 14 deps = [
14 ":native_test_jni_headers", 15 ":native_test_jni_headers",
15 ":native_test_util", 16 ":native_test_util",
16 "//base", 17 "//base",
17 "//base/test:test_support", 18 "//base/test:test_support",
18 "//base/third_party/dynamic_annotations", 19 "//base/third_party/dynamic_annotations",
19 "//testing/gtest", 20 "//testing/gtest",
20 ] 21 ]
21 } 22 }
22 23
23 # GYP: //testing/android/native_test.gyp:native_test_jni_headers 24 # GYP: //testing/android/native_test.gyp:native_test_jni_headers
24 generate_jni("native_test_jni_headers") { 25 generate_jni("native_test_jni_headers") {
25 sources = [ 26 sources = [
26 "java/src/org/chromium/native_test/ChromeNativeTestActivity.java", 27 "java/src/org/chromium/native_test/ChromeNativeTestActivity.java",
27 ] 28 ]
28 jni_package = "testing" 29 jni_package = "testing"
29 } 30 }
30 31
31 # GYP: //testing/android/native_test.gyp:native_test_util 32 # GYP: //testing/android/native_test.gyp:native_test_util
32 source_set("native_test_util") { 33 source_set("native_test_util") {
33 sources = [ 34 sources = [
34 "native_test_util.cc", 35 "native_test_util.cc",
35 "native_test_util.h", 36 "native_test_util.h",
36 ] 37 ]
37 deps = [ 38 deps = [
38 "//base" 39 "//base"
39 ] 40 ]
40 } 41 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698