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

Side by Side Diff: trunk/src/base/base.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
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 'includes': [ 9 'includes': [
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 1278 matching lines...) Expand 10 before | Expand all | Expand 10 after
1289 'android/java/src/org/chromium/base/PathService.java', 1289 'android/java/src/org/chromium/base/PathService.java',
1290 'android/java/src/org/chromium/base/PathUtils.java', 1290 'android/java/src/org/chromium/base/PathUtils.java',
1291 'android/java/src/org/chromium/base/PowerMonitor.java', 1291 'android/java/src/org/chromium/base/PowerMonitor.java',
1292 'android/java/src/org/chromium/base/SystemMessageHandler.java', 1292 'android/java/src/org/chromium/base/SystemMessageHandler.java',
1293 'android/java/src/org/chromium/base/SysUtils.java', 1293 'android/java/src/org/chromium/base/SysUtils.java',
1294 'android/java/src/org/chromium/base/ThreadUtils.java', 1294 'android/java/src/org/chromium/base/ThreadUtils.java',
1295 'android/java/src/org/chromium/base/TraceEvent.java', 1295 'android/java/src/org/chromium/base/TraceEvent.java',
1296 ], 1296 ],
1297 'variables': { 1297 'variables': {
1298 'jni_gen_package': 'base', 1298 'jni_gen_package': 'base',
1299 'jni_generator_ptr_type': 'long',
1299 }, 1300 },
1300 'includes': [ '../build/jni_generator.gypi' ], 1301 'includes': [ '../build/jni_generator.gypi' ],
1301 }, 1302 },
1302 { 1303 {
1303 'target_name': 'base_unittests_jni_headers', 1304 'target_name': 'base_unittests_jni_headers',
1304 'type': 'none', 1305 'type': 'none',
1305 'sources': [ 1306 'sources': [
1306 'test/android/java/src/org/chromium/base/ContentUriTestUtils.java', 1307 'test/android/java/src/org/chromium/base/ContentUriTestUtils.java',
1307 ], 1308 ],
1308 'variables': { 1309 'variables': {
1309 'jni_gen_package': 'base', 1310 'jni_gen_package': 'base',
1311 'jni_generator_ptr_type': 'long',
1310 }, 1312 },
1311 'includes': [ '../build/jni_generator.gypi' ], 1313 'includes': [ '../build/jni_generator.gypi' ],
1312 }, 1314 },
1313 { 1315 {
1314 'target_name': 'base_native_libraries_gen', 1316 'target_name': 'base_native_libraries_gen',
1315 'type': 'none', 1317 'type': 'none',
1316 'sources': [ 1318 'sources': [
1317 'android/java/templates/NativeLibraries.template', 1319 'android/java/templates/NativeLibraries.template',
1318 ], 1320 ],
1319 'variables': { 1321 'variables': {
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
1496 'base_unittests.isolate', 1498 'base_unittests.isolate',
1497 ], 1499 ],
1498 'sources': [ 1500 'sources': [
1499 'base_unittests.isolate', 1501 'base_unittests.isolate',
1500 ], 1502 ],
1501 }, 1503 },
1502 ], 1504 ],
1503 }], 1505 }],
1504 ], 1506 ],
1505 } 1507 }
OLDNEW
« no previous file with comments | « trunk/src/base/android/jni_generator/jni_generator.gyp ('k') | trunk/src/chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698