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

Side by Side Diff: content/content_tests.gypi

Issue 111493006: Have jni_generator.gypi specify include_dirs to dependent targets. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove export_dependent_settings Created 7 years 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': 'test_support_content', 8 'target_name': 'test_support_content',
9 'type': 'static_library', 9 'type': 'static_library',
10 'dependencies': [ 10 'dependencies': [
(...skipping 1404 matching lines...) Expand 10 before | Expand all | Expand 10 after
1415 'shell/android/linker_test_apk/content_linker_test_android.cc', 1415 'shell/android/linker_test_apk/content_linker_test_android.cc',
1416 'shell/android/linker_test_apk/content_linker_test_linker_tests.cc', 1416 'shell/android/linker_test_apk/content_linker_test_linker_tests.cc',
1417 ], 1417 ],
1418 }, 1418 },
1419 { 1419 {
1420 'target_name': 'content_android_linker_test_jni_headers', 1420 'target_name': 'content_android_linker_test_jni_headers',
1421 'type': 'none', 1421 'type': 'none',
1422 'sources': [ 1422 'sources': [
1423 'shell/android/linker_test_apk/src/org/chromium/content_linker_test_ apk/LinkerTests.java', 1423 'shell/android/linker_test_apk/src/org/chromium/content_linker_test_ apk/LinkerTests.java',
1424 ], 1424 ],
1425 'direct_dependent_settings': {
1426 'include_dirs': [
1427 '<(SHARED_INTERMEDIATE_DIR)/content/shell',
1428 ],
1429 },
1430 'variables': { 1425 'variables': {
1431 'jni_gen_package': 'content/shell', 1426 'jni_gen_package': 'content/shell',
1432 }, 1427 },
1433 'includes': [ '../build/jni_generator.gypi' ], 1428 'includes': [ '../build/jni_generator.gypi' ],
1434 }, 1429 },
1435 { 1430 {
1436 'target_name': 'video_decode_accelerator_unittest_apk', 1431 'target_name': 'video_decode_accelerator_unittest_apk',
1437 'type': 'none', 1432 'type': 'none',
1438 'dependencies': [ 1433 'dependencies': [
1439 'video_decode_accelerator_unittest', 1434 'video_decode_accelerator_unittest',
1440 ], 1435 ],
1441 'variables': { 1436 'variables': {
1442 'test_suite_name': 'video_decode_accelerator_unittest', 1437 'test_suite_name': 'video_decode_accelerator_unittest',
1443 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_u nittests<(SHARED_LIB_SUFFIX)', 1438 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_u nittests<(SHARED_LIB_SUFFIX)',
1444 }, 1439 },
1445 'includes': [ '../build/apk_test.gypi' ], 1440 'includes': [ '../build/apk_test.gypi' ],
1446 }, 1441 },
1447 ], 1442 ],
1448 }], 1443 }],
1449 ['OS == "android"', { 1444 ['OS == "android"', {
1450 'targets': [ 1445 'targets': [
1451 { 1446 {
1452 'target_name': 'test_support_content_jni_headers', 1447 'target_name': 'test_support_content_jni_headers',
1453 'type': 'none', 1448 'type': 'none',
1454 'sources': [ 1449 'sources': [
1455 'public/test/android/javatests/src/org/chromium/content/browser/test /NestedSystemMessageHandler.java', 1450 'public/test/android/javatests/src/org/chromium/content/browser/test /NestedSystemMessageHandler.java',
1456 ], 1451 ],
1457 'direct_dependent_settings': {
1458 'include_dirs': [
1459 '<(SHARED_INTERMEDIATE_DIR)/content/public/test',
1460 ],
1461 },
1462 'variables': { 1452 'variables': {
1463 'jni_gen_package': 'content/public/test', 1453 'jni_gen_package': 'content/public/test',
1464 }, 1454 },
1465 'includes': [ '../build/jni_generator.gypi' ], 1455 'includes': [ '../build/jni_generator.gypi' ],
1466 }, 1456 },
1467 { 1457 {
1468 'target_name': 'content_java_test_support', 1458 'target_name': 'content_java_test_support',
1469 'type': 'none', 1459 'type': 'none',
1470 'dependencies': [ 1460 'dependencies': [
1471 '../base/base.gyp:base', 1461 '../base/base.gyp:base',
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
1643 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 1633 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
1644 }, 1634 },
1645 ], 1635 ],
1646 }], 1636 }],
1647 ], 1637 ],
1648 }, 1638 },
1649 ], 1639 ],
1650 }], 1640 }],
1651 ], 1641 ],
1652 } 1642 }
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