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

Side by Side Diff: ui/ui.gyp

Issue 10986094: Make java.gypi use all_dependent_settings for input_jars_paths (Closed) Base URL: http://git.chromium.org/chromium/src.git@apk_combine
Patch Set: Created 8 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
« no previous file with comments | « net/net.gyp ('k') | no next file » | 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 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'ui_resources.gypi', 10 'ui_resources.gypi',
(...skipping 796 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 'ui_jni_headers', 807 'ui_jni_headers',
808 ], 808 ],
809 'include_dirs': [ 809 'include_dirs': [
810 '<(SHARED_INTERMEDIATE_DIR)/ui', 810 '<(SHARED_INTERMEDIATE_DIR)/ui',
811 ], 811 ],
812 }], 812 }],
813 ['OS=="android" and android_build_type==0', { 813 ['OS=="android" and android_build_type==0', {
814 'dependencies': [ 814 'dependencies': [
815 'ui_java', 815 'ui_java',
816 ], 816 ],
817 'export_dependent_settings': [
818 'ui_java',
819 ],
820 }], 817 }],
821 ['OS=="android" or OS=="ios"', { 818 ['OS=="android" or OS=="ios"', {
822 'sources!': [ 819 'sources!': [
823 'gfx/render_text.cc', 820 'gfx/render_text.cc',
824 'gfx/render_text.h', 821 'gfx/render_text.h',
825 ], 822 ],
826 }], 823 }],
827 ['OS=="linux"', { 824 ['OS=="linux"', {
828 'libraries': [ 825 'libraries': [
829 '-ldl', 826 '-ldl',
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
861 { 858 {
862 'target_name': 'ui_java', 859 'target_name': 'ui_java',
863 'type': 'none', 860 'type': 'none',
864 'variables': { 861 'variables': {
865 'package_name': 'ui', 862 'package_name': 'ui',
866 'java_in_dir': '../ui/android/java', 863 'java_in_dir': '../ui/android/java',
867 }, 864 },
868 'dependencies': [ 865 'dependencies': [
869 '../base/base.gyp:base_java', 866 '../base/base.gyp:base_java',
870 ], 867 ],
871 'export_dependent_settings': [
872 '../base/base.gyp:base_java',
873 ],
874 'includes': [ '../build/java.gypi' ], 868 'includes': [ '../build/java.gypi' ],
875 }, 869 },
876 ], 870 ],
877 }], 871 }],
878 ], 872 ],
879 } 873 }
OLDNEW
« no previous file with comments | « net/net.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698