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

Side by Side Diff: trunk/src/chrome/chrome_browser.gypi

Issue 292433004: Revert 270750 "Android: cleans up jni_generator_ptr_type." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 | « trunk/src/base/base.gyp ('k') | trunk/src/components/autofill.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 2012 The Chromium Authors. All rights reserved. 1 # Copyright 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser', 8 'target_name': 'browser',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 'enable_wexit_time_destructors': 1, }, 10 'variables': { 'enable_wexit_time_destructors': 1, },
(...skipping 3616 matching lines...) Expand 10 before | Expand all | Expand 10 after
3627 'android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBar Delegate.java', 3627 'android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBar Delegate.java',
3628 'android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java', 3628 'android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java',
3629 'android/java/src/org/chromium/chrome/browser/infobar/InfoBarContain er.java', 3629 'android/java/src/org/chromium/chrome/browser/infobar/InfoBarContain er.java',
3630 'android/java/src/org/chromium/chrome/browser/infobar/SavePasswordIn foBarDelegate.java', 3630 'android/java/src/org/chromium/chrome/browser/infobar/SavePasswordIn foBarDelegate.java',
3631 'android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoB arDelegate.java', 3631 'android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoB arDelegate.java',
3632 'android/java/src/org/chromium/chrome/browser/invalidation/Invalidat ionController.java', 3632 'android/java/src/org/chromium/chrome/browser/invalidation/Invalidat ionController.java',
3633 'android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.j ava' 3633 'android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.j ava'
3634 ], 3634 ],
3635 'variables': { 3635 'variables': {
3636 'jni_gen_package': 'chrome', 3636 'jni_gen_package': 'chrome',
3637 'jni_generator_ptr_type': 'long',
3637 }, 3638 },
3638 'includes': [ '../build/jni_generator.gypi' ], 3639 'includes': [ '../build/jni_generator.gypi' ],
3639 }, 3640 },
3640 { 3641 {
3641 'target_name': 'activity_type_ids_java', 3642 'target_name': 'activity_type_ids_java',
3642 'type': 'none', 3643 'type': 'none',
3643 'sources': [ 3644 'sources': [
3644 'android/java/ActivityTypeIds.template', 3645 'android/java/ActivityTypeIds.template',
3645 ], 3646 ],
3646 'variables': { 3647 'variables': {
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
3707 'package_name': 'org/chromium/chrome/browser', 3708 'package_name': 'org/chromium/chrome/browser',
3708 'template_deps': ['browser/android/tab_load_status.h'], 3709 'template_deps': ['browser/android/tab_load_status.h'],
3709 }, 3710 },
3710 'includes': [ '../build/android/java_cpp_template.gypi' ], 3711 'includes': [ '../build/android/java_cpp_template.gypi' ],
3711 }, 3712 },
3712 ], 3713 ],
3713 }, 3714 },
3714 ], 3715 ],
3715 ], 3716 ],
3716 } 3717 }
OLDNEW
« no previous file with comments | « trunk/src/base/base.gyp ('k') | trunk/src/components/autofill.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698