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

Side by Side Diff: content/content_shell.gypi

Issue 23868030: Make it possible to use OSMesa on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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/shell/app/shell_main_delegate.cc » ('j') | ui/gl/gl.gyp » ('J')
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 711 matching lines...) Expand 10 before | Expand all | Expand 10 after
722 'target_name': 'content_shell_apk', 722 'target_name': 'content_shell_apk',
723 'type': 'none', 723 'type': 'none',
724 'dependencies': [ 724 'dependencies': [
725 'content_java', 725 'content_java',
726 'content_java_test_support', 726 'content_java_test_support',
727 'content_shell_java', 727 'content_shell_java',
728 'libcontent_shell_content_view', 728 'libcontent_shell_content_view',
729 '../base/base.gyp:base_java', 729 '../base/base.gyp:base_java',
730 '../media/media.gyp:media_java', 730 '../media/media.gyp:media_java',
731 '../net/net.gyp:net_java', 731 '../net/net.gyp:net_java',
732 '../third_party/mesa/mesa.gyp:osmesa',
732 '../tools/android/forwarder/forwarder.gyp:forwarder', 733 '../tools/android/forwarder/forwarder.gyp:forwarder',
733 '../ui/ui.gyp:ui_java', 734 '../ui/ui.gyp:ui_java',
734 ], 735 ],
735 'variables': { 736 'variables': {
736 'apk_name': 'ContentShell', 737 'apk_name': 'ContentShell',
737 'manifest_package_name': 'org.chromium.content_shell_apk', 738 'manifest_package_name': 'org.chromium.content_shell_apk',
738 'java_in_dir': 'shell/android/shell_apk', 739 'java_in_dir': 'shell/android/shell_apk',
739 'resource_dir': 'shell/android/shell_apk/res', 740 'resource_dir': 'shell/android/shell_apk/res',
740 'native_lib_target': 'libcontent_shell_content_view', 741 'native_lib_target': 'libcontent_shell_content_view',
741 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'], 742 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'],
742 'asset_location': '<(ant_build_out)/content_shell/assets', 743 'asset_location': '<(ant_build_out)/content_shell/assets',
744 'extra_native_libs': ['<(SHARED_LIB_DIR)/libosmesa.so'],
743 }, 745 },
746 'actions': [
747 {
748 # Copy libosmesa.so to the out/$BUILDTYPE/lib/ directory. The
749 # write_ordered_libraries.py script requires it to be in that
750 # directory, because otherwise it will be seen as a system lib
751 # which causes it to not be stripped.
752 'action_name': 'copy_libosmesa',
753 'inputs': ['<(PRODUCT_DIR)/libosmesa.so'],
754 'outputs': ['<(SHARED_LIB_DIR)/libosmesa.so'],
755 'action': [
756 'cp',
757 '<(PRODUCT_DIR)/libosmesa.so',
758 '<(SHARED_LIB_DIR)/libosmesa.so',
759 ],
760 },
761 ],
744 'conditions': [ 762 'conditions': [
745 ['android_webview_build==0', { 763 ['android_webview_build==0', {
746 'dependencies': [ 764 'dependencies': [
747 '../tools/imagediff/image_diff.gyp:image_diff#host', 765 '../tools/imagediff/image_diff.gyp:image_diff#host',
748 ], 766 ],
749 }], 767 }],
750 ], 768 ],
751 'includes': [ '../build/java_apk.gypi' ], 769 'includes': [ '../build/java_apk.gypi' ],
752 }, 770 },
753 ], 771 ],
(...skipping 27 matching lines...) Expand all
781 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', 799 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
782 '--destination_dir', '<(dest_dir)', 800 '--destination_dir', '<(dest_dir)',
783 ], 801 ],
784 }, 802 },
785 ], 803 ],
786 }, 804 },
787 ], 805 ],
788 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" 806 }], # OS=="win" and fastbuild==0 and target_arch=="ia32"
789 ] 807 ]
790 } 808 }
OLDNEW
« no previous file with comments | « no previous file | content/shell/app/shell_main_delegate.cc » ('j') | ui/gl/gl.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698