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

Side by Side Diff: content/content_shell.gypi

Issue 12213021: Android content_browsertests: Allow processing java tasks in nested mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 10 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 | « no previous file | content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java » ('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 543 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 ], 554 ],
555 }], # OS=="mac" 555 }], # OS=="mac"
556 ['OS=="android"', { 556 ['OS=="android"', {
557 'targets': [ 557 'targets': [
558 { 558 {
559 # TODO(jrg): Update this action and other jni generators to only 559 # TODO(jrg): Update this action and other jni generators to only
560 # require specifying the java directory and generate the rest. 560 # require specifying the java directory and generate the rest.
561 'target_name': 'content_shell_jni_headers', 561 'target_name': 'content_shell_jni_headers',
562 'type': 'none', 562 'type': 'none',
563 'sources': [ 563 'sources': [
564 'shell/android/browsertests_apk/src/org/chromium/content_browsertest s_apk/BrowserTestSystemMessageHandler.java',
564 'shell/android/browsertests_apk/src/org/chromium/content_browsertest s_apk/ContentBrowserTestsActivity.java', 565 'shell/android/browsertests_apk/src/org/chromium/content_browsertest s_apk/ContentBrowserTestsActivity.java',
565 'shell/android/java/src/org/chromium/content_shell/ShellManager.java ', 566 'shell/android/java/src/org/chromium/content_shell/ShellManager.java ',
566 'shell/android/java/src/org/chromium/content_shell/Shell.java', 567 'shell/android/java/src/org/chromium/content_shell/Shell.java',
567 ], 568 ],
568 'direct_dependent_settings': { 569 'direct_dependent_settings': {
569 'include_dirs': [ 570 'include_dirs': [
570 '<(SHARED_INTERMEDIATE_DIR)/content/shell', 571 '<(SHARED_INTERMEDIATE_DIR)/content/shell',
571 ], 572 ],
572 }, 573 },
573 'variables': { 574 'variables': {
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
665 'native_libs_paths': ['<(SHARED_LIB_DIR)/libcontent_shell_content_vi ew.so'], 666 'native_libs_paths': ['<(SHARED_LIB_DIR)/libcontent_shell_content_vi ew.so'],
666 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'], 667 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'],
667 'asset_location': '<(ant_build_out)/content_shell/assets', 668 'asset_location': '<(ant_build_out)/content_shell/assets',
668 }, 669 },
669 'includes': [ '../build/java_apk.gypi' ], 670 'includes': [ '../build/java_apk.gypi' ],
670 }, 671 },
671 ], 672 ],
672 }], # OS=="android" 673 }], # OS=="android"
673 ] 674 ]
674 } 675 }
OLDNEW
« no previous file with comments | « no previous file | content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698