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

Side by Side Diff: content/content_tests.gypi

Issue 288963002: Android: cleans up jni_generator_ptr_type. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/content_shell.gypi ('k') | media/media.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'layouttest_support_content', 8 'target_name': 'layouttest_support_content',
9 'type': 'static_library', 9 'type': 'static_library',
10 'conditions': [ 10 'conditions': [
(...skipping 1597 matching lines...) Expand 10 before | Expand all | Expand 10 after
1608 ], 1608 ],
1609 }, 1609 },
1610 { 1610 {
1611 'target_name': 'chromium_android_linker_test_jni_headers', 1611 'target_name': 'chromium_android_linker_test_jni_headers',
1612 'type': 'none', 1612 'type': 'none',
1613 'sources': [ 1613 'sources': [
1614 'shell/android/linker_test_apk/src/org/chromium/chromium_linker_test _apk/LinkerTests.java', 1614 'shell/android/linker_test_apk/src/org/chromium/chromium_linker_test _apk/LinkerTests.java',
1615 ], 1615 ],
1616 'variables': { 1616 'variables': {
1617 'jni_gen_package': 'content/shell', 1617 'jni_gen_package': 'content/shell',
1618 'jni_generator_ptr_type': 'long',
1619 }, 1618 },
1620 'includes': [ '../build/jni_generator.gypi' ], 1619 'includes': [ '../build/jni_generator.gypi' ],
1621 }, 1620 },
1622 { 1621 {
1623 'target_name': 'video_decode_accelerator_unittest_apk', 1622 'target_name': 'video_decode_accelerator_unittest_apk',
1624 'type': 'none', 1623 'type': 'none',
1625 'dependencies': [ 1624 'dependencies': [
1626 'video_decode_accelerator_unittest', 1625 'video_decode_accelerator_unittest',
1627 ], 1626 ],
1628 'variables': { 1627 'variables': {
1629 'test_suite_name': 'video_decode_accelerator_unittest', 1628 'test_suite_name': 'video_decode_accelerator_unittest',
1630 }, 1629 },
1631 'includes': [ '../build/apk_test.gypi' ], 1630 'includes': [ '../build/apk_test.gypi' ],
1632 }, 1631 },
1633 ], 1632 ],
1634 }], 1633 }],
1635 ['OS == "android"', { 1634 ['OS == "android"', {
1636 'targets': [ 1635 'targets': [
1637 { 1636 {
1638 'target_name': 'test_support_content_jni_headers', 1637 'target_name': 'test_support_content_jni_headers',
1639 'type': 'none', 1638 'type': 'none',
1640 'sources': [ 1639 'sources': [
1641 'public/test/android/javatests/src/org/chromium/content/browser/test /NestedSystemMessageHandler.java', 1640 'public/test/android/javatests/src/org/chromium/content/browser/test /NestedSystemMessageHandler.java',
1642 ], 1641 ],
1643 'variables': { 1642 'variables': {
1644 'jni_gen_package': 'content/public/test', 1643 'jni_gen_package': 'content/public/test',
1645 'jni_generator_ptr_type': 'long',
1646 }, 1644 },
1647 'includes': [ '../build/jni_generator.gypi' ], 1645 'includes': [ '../build/jni_generator.gypi' ],
1648 }, 1646 },
1649 { 1647 {
1650 'target_name': 'content_java_test_support', 1648 'target_name': 'content_java_test_support',
1651 'type': 'none', 1649 'type': 'none',
1652 'dependencies': [ 1650 'dependencies': [
1653 '../base/base.gyp:base', 1651 '../base/base.gyp:base',
1654 '../base/base.gyp:base_java_test_support', 1652 '../base/base.gyp:base_java_test_support',
1655 'content.gyp:content_common', 1653 'content.gyp:content_common',
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
1825 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 1823 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
1826 }, 1824 },
1827 ], 1825 ],
1828 }], 1826 }],
1829 ], 1827 ],
1830 }, 1828 },
1831 ], 1829 ],
1832 }], 1830 }],
1833 ], 1831 ],
1834 } 1832 }
OLDNEW
« no previous file with comments | « content/content_shell.gypi ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698