Index: build/apk_test.gypi |
diff --git a/build/apk_test.gypi b/build/apk_test.gypi |
index 6512b6d9f65573d7cef43aa406c7887f8125b0fe..1d1988dc268d2466c21c34f67ec9c2f17d143afe 100644 |
--- a/build/apk_test.gypi |
+++ b/build/apk_test.gypi |
@@ -33,12 +33,49 @@ |
'test_type': 'gtest', |
'apk_name': '<(test_suite_name)', |
'intermediate_dir': '<(PRODUCT_DIR)/<(test_suite_name)_apk', |
+ 'generated_src_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/<(test_suite_name)_jinja', ], |
'final_apk_path': '<(intermediate_dir)/<(test_suite_name)-debug.apk', |
'java_in_dir': '<(DEPTH)/testing/android/native_test/java', |
'native_lib_target': 'lib<(test_suite_name)', |
# TODO(yfriedman, cjhopman): Support managed installs for gtests. |
'gyp_managed_install': 0, |
+ 'variables': { |
+ 'use_native_activity%': "false", |
+ 'android_manifest_path%': '', |
+ }, |
+ 'use_native_activity%': '<(use_native_activity)', |
+ 'jinja_variables': [ |
+ 'native_library_name=<(test_suite_name)', |
+ 'use_native_activity=<(use_native_activity)', |
+ ], |
+ 'conditions': [ |
+ ['component == "shared_library"', { |
+ 'jinja_variables': [ |
+ 'is_component_build=true', |
+ ], |
+ }, { |
+ 'jinja_variables': [ |
+ 'is_component_build=false', |
+ ], |
+ }], |
+ ['android_manifest_path == ""', { |
+ 'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/<(test_suite_name)_jinja/AndroidManifest.xml', |
+ 'manifest_template': '<(DEPTH)/testing/android/native_test/java', |
+ }, { |
+ 'android_manifest_path%': '<(android_manifest_path)', |
+ 'manifest_template': '', |
+ }], |
+ ], |
}, |
+ 'conditions': [ |
+ ['manifest_template != ""', { |
+ 'variables': { |
+ 'jinja_inputs': '<(manifest_template)/AndroidManifest.xml.jinja2', |
+ 'jinja_output': '<(android_manifest_path)', |
+ }, |
+ 'includes': ['android/jinja_template.gypi'], |
+ }], |
+ ], |
'includes': [ 'java_apk.gypi', 'android/test_runner.gypi' ], |
}], # 'OS == "android" |
], # conditions |