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

Side by Side Diff: chrome/chrome_android.gypi

Issue 864563002: Separate JNI registration with initialization (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments and sync Created 5 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
« no previous file with comments | « chrome/app/android/chrome_jni_onload.cc ('k') | chrome/chrome_shell.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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 'conditions': [ 7 'conditions': [
8 ['component != "shared_library" and target_arch != "arm64" and target_arch != "x64" and profiling_full_stack_frames != 1', { 8 ['component != "shared_library" and target_arch != "arm64" and target_arch != "x64" and profiling_full_stack_frames != 1', {
9 # Only enable the chromium linker on regular builds, since the 9 # Only enable the chromium linker on regular builds, since the
10 # component build crashes on Android 4.4. See b/11379966 10 # component build crashes on Android 4.4. See b/11379966
(...skipping 22 matching lines...) Expand all
33 '../content/content.gyp:content', 33 '../content/content.gyp:content',
34 '../content/content.gyp:content_app_browser', 34 '../content/content.gyp:content_app_browser',
35 ], 35 ],
36 'include_dirs': [ 36 'include_dirs': [
37 '..', 37 '..',
38 '<(android_ndk_include)', 38 '<(android_ndk_include)',
39 ], 39 ],
40 'sources': [ 40 'sources': [
41 'app/android/chrome_android_initializer.cc', 41 'app/android/chrome_android_initializer.cc',
42 'app/android/chrome_android_initializer.h', 42 'app/android/chrome_android_initializer.h',
43 'app/android/chrome_jni_onload.cc',
43 'app/android/chrome_main_delegate_android.cc', 44 'app/android/chrome_main_delegate_android.cc',
44 'app/android/chrome_main_delegate_android.h', 45 'app/android/chrome_main_delegate_android.h',
45 'app/chrome_main_delegate.cc', 46 'app/chrome_main_delegate.cc',
46 'app/chrome_main_delegate.h', 47 'app/chrome_main_delegate.h',
47 ], 48 ],
48 'link_settings': { 49 'link_settings': {
49 'libraries': [ 50 'libraries': [
50 '-landroid', 51 '-landroid',
51 '-ljnigraphics', 52 '-ljnigraphics',
52 ], 53 ],
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 '-f', '<(branding_path)', 103 '-f', '<(branding_path)',
103 '-e', 'CHANNEL=str.upper("<(android_channel)")', 104 '-e', 'CHANNEL=str.upper("<(android_channel)")',
104 '<(template_input_path)', 105 '<(template_input_path)',
105 '<(output_path)', 106 '<(output_path)',
106 ], 107 ],
107 }, 108 },
108 ], 109 ],
109 }, 110 },
110 ], 111 ],
111 } 112 }
OLDNEW
« no previous file with comments | « chrome/app/android/chrome_jni_onload.cc ('k') | chrome/chrome_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698