OLD | NEW |
---|---|
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 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/ui.gni") | 5 import("//build/config/ui.gni") |
6 import("//testing/test.gni") | 6 import("//testing/test.gni") |
7 | 7 |
8 if (is_android) { | 8 if (is_android) { |
9 import("//build/config/android/rules.gni") | 9 import("//build/config/android/rules.gni") |
10 } | 10 } |
(...skipping 1450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1461 | 1461 |
1462 # GYP: //base.gyp:base_java_unittest_support | 1462 # GYP: //base.gyp:base_java_unittest_support |
1463 android_library("base_java_unittest_support") { | 1463 android_library("base_java_unittest_support") { |
1464 deps = [ | 1464 deps = [ |
1465 ":base_java", | 1465 ":base_java", |
1466 ] | 1466 ] |
1467 java_files = | 1467 java_files = |
1468 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] | 1468 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] |
1469 } | 1469 } |
1470 } | 1470 } |
1471 | |
Peter Kasting
2015/03/26 04:29:05
You can probably omit the changes to the .gn/.gyp/
Mike Wittman
2015/03/27 22:42:01
Done.
Peter Kasting
2015/03/30 23:07:34
(You removed the .gyp, but not the .gn or .gypi.
Mike Wittman
2015/03/31 01:06:36
I had to add those back for native_stack_sampler.{
| |
OLD | NEW |