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

Side by Side Diff: trunk/src/testing/android/native_test.gyp

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/sync/sync_android.gypi ('k') | trunk/src/ui/base/ui_base.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 'conditions': [ 6 'conditions': [
7 ['OS=="android"', { 7 ['OS=="android"', {
8 'targets': [ 8 'targets': [
9 { 9 {
10 'target_name': 'native_test_native_code', 10 'target_name': 'native_test_native_code',
(...skipping 19 matching lines...) Expand all
30 ], 30 ],
31 }, 31 },
32 { 32 {
33 'target_name': 'native_test_jni_headers', 33 'target_name': 'native_test_jni_headers',
34 'type': 'none', 34 'type': 'none',
35 'sources': [ 35 'sources': [
36 'java/src/org/chromium/native_test/ChromeNativeTestActivity.java' 36 'java/src/org/chromium/native_test/ChromeNativeTestActivity.java'
37 ], 37 ],
38 'variables': { 38 'variables': {
39 'jni_gen_package': 'testing', 39 'jni_gen_package': 'testing',
40 'jni_generator_ptr_type': 'long',
40 }, 41 },
41 'includes': [ '../../build/jni_generator.gypi' ], 42 'includes': [ '../../build/jni_generator.gypi' ],
42 }, 43 },
43 { 44 {
44 'target_name': 'native_test_util', 45 'target_name': 'native_test_util',
45 'type': 'static_library', 46 'type': 'static_library',
46 'sources': [ 47 'sources': [
47 'native_test_util.cc', 48 'native_test_util.cc',
48 'native_test_util.h', 49 'native_test_util.h',
49 ], 50 ],
50 'dependencies': [ 51 'dependencies': [
51 '../../base/base.gyp:base', 52 '../../base/base.gyp:base',
52 ], 53 ],
53 }, 54 },
54 ], 55 ],
55 }] 56 }]
56 ], 57 ],
57 } 58 }
OLDNEW
« no previous file with comments | « trunk/src/sync/sync_android.gypi ('k') | trunk/src/ui/base/ui_base.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698