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

Side by Side Diff: remoting/remoting.gyp

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 | « printing/printing.gyp ('k') | testing/android/native_test.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) 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 'variables': { 9 'variables': {
10 'conditions': [ 10 'conditions': [
(...skipping 1825 matching lines...) Expand 10 before | Expand all | Expand 10 after
1836 'target_name': 'remoting_client_jni', 1836 'target_name': 'remoting_client_jni',
1837 'type': 'shared_library', 1837 'type': 'shared_library',
1838 'dependencies': [ 1838 'dependencies': [
1839 'remoting_base', 1839 'remoting_base',
1840 'remoting_client', 1840 'remoting_client',
1841 'remoting_jingle_glue', 1841 'remoting_jingle_glue',
1842 'remoting_jni_headers', 1842 'remoting_jni_headers',
1843 'remoting_protocol', 1843 'remoting_protocol',
1844 '../google_apis/google_apis.gyp:google_apis', 1844 '../google_apis/google_apis.gyp:google_apis',
1845 ], 1845 ],
1846 'include_dirs': [
1847 '<(SHARED_INTERMEDIATE_DIR)/remoting',
1848 ],
1849 'sources': [ 1846 'sources': [
1850 'client/jni/android_keymap.cc', 1847 'client/jni/android_keymap.cc',
1851 'client/jni/android_keymap.h', 1848 'client/jni/android_keymap.h',
1852 'client/jni/chromoting_jni_instance.cc', 1849 'client/jni/chromoting_jni_instance.cc',
1853 'client/jni/chromoting_jni_instance.h', 1850 'client/jni/chromoting_jni_instance.h',
1854 'client/jni/chromoting_jni_onload.cc', 1851 'client/jni/chromoting_jni_onload.cc',
1855 'client/jni/chromoting_jni_runtime.cc', 1852 'client/jni/chromoting_jni_runtime.cc',
1856 'client/jni/chromoting_jni_runtime.h', 1853 'client/jni/chromoting_jni_runtime.h',
1857 'client/jni/jni_frame_consumer.cc', 1854 'client/jni/jni_frame_consumer.cc',
1858 'client/jni/jni_frame_consumer.h', 1855 'client/jni/jni_frame_consumer.h',
(...skipping 1171 matching lines...) Expand 10 before | Expand all | Expand 10 after
3030 '../base/allocator/allocator.gyp:allocator', 3027 '../base/allocator/allocator.gyp:allocator',
3031 ], 3028 ],
3032 }, 3029 },
3033 ], 3030 ],
3034 ], 3031 ],
3035 }], # end of 'toolkit_uses_gtk == 1' 3032 }], # end of 'toolkit_uses_gtk == 1'
3036 ], # end of 'conditions' 3033 ], # end of 'conditions'
3037 }, # end of target 'remoting_unittests' 3034 }, # end of target 'remoting_unittests'
3038 ], # end of targets 3035 ], # end of targets
3039 } 3036 }
OLDNEW
« no previous file with comments | « printing/printing.gyp ('k') | testing/android/native_test.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698