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

Unified Diff: testing/android/native_test.gyp

Issue 1975153003: Enable NativeActivity based Android tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
Index: testing/android/native_test.gyp
diff --git a/testing/android/native_test.gyp b/testing/android/native_test.gyp
index b6fed8623aeb98e7934dc8606f4c249f9ce0b40a..4e4511e101b7309d27eb8eb7b6c8b876ca1abc7b 100644
--- a/testing/android/native_test.gyp
+++ b/testing/android/native_test.gyp
@@ -7,11 +7,24 @@
['OS=="android"', {
'targets': [
{
+ 'target_name': 'native_test_activity',
+ 'type': 'none',
+ 'variables': {
+ 'jinja_inputs': [ 'native_test/java/src/org/chromium/native_test/NativeTestActivity.java.jinja2' ],
+ 'jinja_output': '<(SHARED_INTERMEDIATE_DIR)/native_test_activity/java/src/org/chromium/native_test/NativeTestActivity.java',
+ 'jinja_variables': [ 'use_native_activity="false"', ],
+ },
+ 'includes': [ '../../build/android/jinja_template.gypi' ],
+ },
+ {
# GN: //testing/android:native_test_jni_headers
'target_name': 'native_test_jni_headers',
'type': 'none',
+ 'dependencies': [
+ 'native_test_activity',
+ ],
'sources': [
- 'native_test/java/src/org/chromium/native_test/NativeTestActivity.java'
+ '<(SHARED_INTERMEDIATE_DIR)/native_test_activity/java/src/org/chromium/native_test/NativeTestActivity.java'
],
'variables': {
'jni_gen_package': 'testing',
@@ -59,11 +72,13 @@
'on_device_instrumentation.gyp:reporter_java',
'../../base/base.gyp:base_native_libraries_gen',
'../../base/base.gyp:base_java',
+ 'native_test_activity',
],
'variables': {
'chromium_code': '1',
'jar_excluded_classes': [ '*/NativeLibraries.class' ],
'java_in_dir': 'native_test/java',
+ 'generated_src_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/native_test_activity', ],
},
'includes': [ '../../build/java.gypi' ],
},

Powered by Google App Engine
This is Rietveld 408576698