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

Side by Side Diff: ui/gfx/gfx.gyp

Issue 288963002: Android: cleans up jni_generator_ptr_type. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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 | « ui/base/ui_base.gyp ('k') | ui/gl/gl.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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 { 536 {
537 'target_name': 'gfx_jni_headers', 537 'target_name': 'gfx_jni_headers',
538 'type': 'none', 538 'type': 'none',
539 'sources': [ 539 'sources': [
540 '../android/java/src/org/chromium/ui/gfx/BitmapHelper.java', 540 '../android/java/src/org/chromium/ui/gfx/BitmapHelper.java',
541 '../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java', 541 '../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java',
542 '../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java ', 542 '../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java ',
543 ], 543 ],
544 'variables': { 544 'variables': {
545 'jni_gen_package': 'ui/gfx', 545 'jni_gen_package': 'ui/gfx',
546 'jni_generator_ptr_type': 'long'
547 }, 546 },
548 'includes': [ '../../build/jni_generator.gypi' ], 547 'includes': [ '../../build/jni_generator.gypi' ],
549 }, 548 },
550 ], 549 ],
551 }], 550 }],
552 # Special target to wrap a gtest_target_type==shared_library 551 # Special target to wrap a gtest_target_type==shared_library
553 # gfx_unittests into an android apk for execution. 552 # gfx_unittests into an android apk for execution.
554 # See base.gyp for TODO(jrg)s about this strategy. 553 # See base.gyp for TODO(jrg)s about this strategy.
555 ['OS == "android" and gtest_target_type == "shared_library"', { 554 ['OS == "android" and gtest_target_type == "shared_library"', {
556 'targets': [ 555 'targets': [
557 { 556 {
558 'target_name': 'gfx_unittests_apk', 557 'target_name': 'gfx_unittests_apk',
559 'type': 'none', 558 'type': 'none',
560 'dependencies': [ 559 'dependencies': [
561 'gfx_unittests', 560 'gfx_unittests',
562 ], 561 ],
563 'variables': { 562 'variables': {
564 'test_suite_name': 'gfx_unittests', 563 'test_suite_name': 'gfx_unittests',
565 }, 564 },
566 'includes': [ '../../build/apk_test.gypi' ], 565 'includes': [ '../../build/apk_test.gypi' ],
567 }, 566 },
568 ], 567 ],
569 }], 568 }],
570 ], 569 ],
571 } 570 }
OLDNEW
« no previous file with comments | « ui/base/ui_base.gyp ('k') | ui/gl/gl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698