Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 import("//testing/test.gni") | 6 import("//testing/test.gni") |
| 7 | 7 |
| 8 # Mark all targets as test only. | 8 # Mark all targets as test only. |
| 9 testonly = true | 9 testonly = true |
| 10 | 10 |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 257 sources = [ | 257 sources = [ |
| 258 "unittest/assets/asset_file.ogg", | 258 "unittest/assets/asset_file.ogg", |
| 259 ] | 259 ] |
| 260 } | 260 } |
| 261 | 261 |
| 262 android_library("android_webview_unittests_java") { | 262 android_library("android_webview_unittests_java") { |
| 263 testonly = true | 263 testonly = true |
| 264 deps = [ | 264 deps = [ |
| 265 "//android_webview:android_webview_java", | 265 "//android_webview:android_webview_java", |
| 266 "//base:base_java", | 266 "//base:base_java", |
| 267 "//base:base_java_test_support", | |
|
boliu
2016/12/15 01:43:02
this change seems totally unrelated to this CL? pu
Jay Civelli
2016/12/16 16:59:52
It is somehow related. I changed testing/test.gni
boliu
2016/12/16 17:13:41
Sure.. lgtm
| |
| 268 "//content/public/test/android:content_java_test_support", | 267 "//content/public/test/android:content_java_test_support", |
| 269 ] | 268 ] |
| 270 java_files = [ | 269 java_files = [ |
| 271 "../unittestjava/src/org/chromium/android_webview/unittest/InputStreamUnitte st.java", | 270 "../unittestjava/src/org/chromium/android_webview/unittest/InputStreamUnitte st.java", |
| 272 "../unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsCli entBridge.java", | 271 "../unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsCli entBridge.java", |
| 273 ] | 272 ] |
| 274 } | 273 } |
| 275 | 274 |
| 276 generate_jni("android_webview_unittests_jni") { | 275 generate_jni("android_webview_unittests_jni") { |
| 277 jni_package = "android_webview_unittests" | 276 jni_package = "android_webview_unittests" |
| 278 sources = [ | 277 sources = [ |
| 279 "../unittestjava/src/org/chromium/android_webview/unittest/InputStreamUnitte st.java", | 278 "../unittestjava/src/org/chromium/android_webview/unittest/InputStreamUnitte st.java", |
| 280 "../unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsCli entBridge.java", | 279 "../unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsCli entBridge.java", |
| 281 ] | 280 ] |
| 282 } | 281 } |
| 283 | 282 |
| 284 shared_library("libdrawgl") { | 283 shared_library("libdrawgl") { |
| 285 sources = [ | 284 sources = [ |
| 286 "shell/src/draw_gl/draw_gl.cc", | 285 "shell/src/draw_gl/draw_gl.cc", |
| 287 ] | 286 ] |
| 288 configs -= [ "//build/config/android:hide_native_jni_exports" ] | 287 configs -= [ "//build/config/android:hide_native_jni_exports" ] |
| 289 } | 288 } |
| OLD | NEW |