| Index: content/content_tests.gypi
|
| diff --git a/content/content_tests.gypi b/content/content_tests.gypi
|
| index 63e5e2b2f5e457a83bc8cfa76e113e0997af5d12..b9357a1da33ac6f9f2b93a697162a56c1f682d95 100644
|
| --- a/content/content_tests.gypi
|
| +++ b/content/content_tests.gypi
|
| @@ -1298,6 +1298,68 @@
|
| 'includes': [ '../build/java_apk.gypi' ],
|
| },
|
| {
|
| + 'target_name': 'content_linker_test_apk',
|
| + 'type': 'none',
|
| + 'dependencies': [
|
| + 'content_android_linker_test',
|
| + 'content_java',
|
| + 'content_shell_java',
|
| + ],
|
| + 'variables': {
|
| + 'apk_name': 'ContentLinkerTest',
|
| + 'java_in_dir': 'shell/android/linker_test_apk',
|
| + 'resource_dir': 'shell/android/linker_test_apk/res',
|
| + 'native_lib_target': 'libcontent_android_linker_test',
|
| + 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
|
| + 'asset_location': '<(ant_build_out)/content_shell/assets',
|
| + 'use_chrome_linker': '1',
|
| + 'enable_chrome_linker_tests': '1',
|
| + },
|
| + 'includes': [ '../build/java_apk.gypi' ],
|
| + },
|
| + {
|
| + 'target_name': 'content_android_linker_test',
|
| + 'type': 'shared_library',
|
| + 'defines!': ['CONTENT_IMPLEMENTATION'],
|
| + 'dependencies': [
|
| + 'content_common',
|
| + 'content_gpu',
|
| + 'content_plugin',
|
| + 'content_renderer',
|
| + 'content_resources.gyp:content_resources',
|
| + 'content_shell_jni_headers',
|
| + 'content_shell_lib',
|
| + 'content_shell_pak',
|
| + 'test_support_content',
|
| + '../base/base.gyp:test_support_base',
|
| + '../gpu/gpu.gyp:gpu',
|
| + '../ipc/ipc.gyp:test_support_ipc',
|
| + '../net/net.gyp:net_test_support',
|
| + '../ppapi/ppapi_internal.gyp:ppapi_host',
|
| + '../ppapi/ppapi_internal.gyp:ppapi_ipc',
|
| + '../ppapi/ppapi_internal.gyp:ppapi_proxy',
|
| + '../ppapi/ppapi_internal.gyp:ppapi_shared',
|
| + '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
|
| + '../skia/skia.gyp:skia',
|
| + '../testing/gmock.gyp:gmock',
|
| + '../testing/gtest.gyp:gtest',
|
| + '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
|
| + '../third_party/mesa/mesa.gyp:osmesa',
|
| + '../ui/gl/gl.gyp:gl',
|
| + '../ui/snapshot/snapshot.gyp:snapshot',
|
| + '../ui/ui.gyp:shell_dialogs',
|
| + '../ui/ui.gyp:ui',
|
| + '../ui/ui.gyp:ui_resources',
|
| + '../webkit/glue/webkit_glue.gyp:glue',
|
| + '../webkit/glue/webkit_glue.gyp:glue_child',
|
| + '../webkit/renderer/webkit_renderer.gyp:webkit_renderer',
|
| + ],
|
| + 'sources': [
|
| + 'shell/android/linker_test_apk/content_linker_test_android.cc',
|
| + 'shell/android/linker_test_apk/content_linker_test_linker_tests.cc',
|
| + ],
|
| + },
|
| + {
|
| 'target_name': 'video_decode_accelerator_unittest_apk',
|
| 'type': 'none',
|
| 'dependencies': [
|
|
|