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

Side by Side Diff: content/content_shell.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.gyp ('k') | content/content_tests.gypi » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'variables': { 6 'variables': {
7 'content_shell_product_name': 'Content Shell', 7 'content_shell_product_name': 'Content Shell',
8 # The "19" is so that sites that sniff for version think that this is 8 # The "19" is so that sites that sniff for version think that this is
9 # something reasonably current; the "77.34.5" is a hint that this isn't a 9 # something reasonably current; the "77.34.5" is a hint that this isn't a
10 # standard Chrome. 10 # standard Chrome.
(...skipping 698 matching lines...) Expand 10 before | Expand all | Expand 10 after
709 # TODO(jrg): Update this action and other jni generators to only 709 # TODO(jrg): Update this action and other jni generators to only
710 # require specifying the java directory and generate the rest. 710 # require specifying the java directory and generate the rest.
711 'target_name': 'content_shell_jni_headers', 711 'target_name': 'content_shell_jni_headers',
712 'type': 'none', 712 'type': 'none',
713 'sources': [ 713 'sources': [
714 'shell/android/browsertests_apk/src/org/chromium/content_browsertest s_apk/ContentBrowserTestsActivity.java', 714 'shell/android/browsertests_apk/src/org/chromium/content_browsertest s_apk/ContentBrowserTestsActivity.java',
715 'shell/android/java/src/org/chromium/content_shell/ShellLayoutTestUt ils.java', 715 'shell/android/java/src/org/chromium/content_shell/ShellLayoutTestUt ils.java',
716 'shell/android/java/src/org/chromium/content_shell/ShellManager.java ', 716 'shell/android/java/src/org/chromium/content_shell/ShellManager.java ',
717 'shell/android/java/src/org/chromium/content_shell/Shell.java', 717 'shell/android/java/src/org/chromium/content_shell/Shell.java',
718 ], 718 ],
719 'direct_dependent_settings': {
720 'include_dirs': [
721 '<(SHARED_INTERMEDIATE_DIR)/content/shell',
722 ],
723 },
724 'variables': { 719 'variables': {
725 'jni_gen_package': 'content/shell', 720 'jni_gen_package': 'content/shell',
726 }, 721 },
727 'includes': [ '../build/jni_generator.gypi' ], 722 'includes': [ '../build/jni_generator.gypi' ],
728 }, 723 },
729 { 724 {
730 'target_name': 'libcontent_shell_content_view', 725 'target_name': 'libcontent_shell_content_view',
731 'type': 'shared_library', 726 'type': 'shared_library',
732 'dependencies': [ 727 'dependencies': [
733 'content_shell_jni_headers', 728 'content_shell_jni_headers',
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
863 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', 858 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
864 '--destination_dir', '<(dest_dir)', 859 '--destination_dir', '<(dest_dir)',
865 ], 860 ],
866 }, 861 },
867 ], 862 ],
868 }, 863 },
869 ], 864 ],
870 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" 865 }], # OS=="win" and fastbuild==0 and target_arch=="ia32"
871 ] 866 ]
872 } 867 }
OLDNEW
« no previous file with comments | « content/content.gyp ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698