base/base.gyp - Issue 1218053003: [Android] Begin switching from lighttpd + apache to EmbeddedTestServer.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/base.gyp

Issue 1218053003: [Android] Begin switching from lighttpd + apache to EmbeddedTestServer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « base/android/java/templates/NativeTestLibraries.template ('k') | base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: base/base.gyp

diff --git a/base/base.gyp b/base/base.gyp

index 8536727485812ea607a4377843bfbe649df10933..eb932da917ab6b35bace598485675f26947ae500 100644

--- a/base/base.gyp

+++ b/base/base.gyp

@@ -1424,6 +1424,19 @@

'includes': [ '../build/android/java_cpp_template.gypi' ],

{

+ # GN: //base:base_native_test_libraries_gen

+ 'target_name': 'base_native_test_libraries_gen',

+ 'type': 'none',

+ 'sources': [

+ 'android/java/templates/NativeTestLibraries.template',

+ ],

+ 'variables': {

+ 'package_name': 'org/chromium/base/library_loader',

+ 'template_deps': [],

+ },

+ 'includes': [ '../build/android/java_cpp_template.gypi' ],

+ },

+ {

# GN: //base:base_android_java_enums_srcjar

'target_name': 'base_java_library_process_type',

'type': 'none',

@@ -1495,9 +1508,11 @@

'type': 'none',

'dependencies': [

'base_java',

+ 'base_native_test_libraries_gen',

'../testing/android/on_device_instrumentation.gyp:reporter_java',

'variables': {

+ 'jar_excluded_classes': [ '*/NativeTestLibraries.class' ],

'java_in_dir': '../base/test/android/javatests',

'includes': [ '../build/java.gypi' ],