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

Side by Side Diff: content/content.gyp

Issue 10913083: Remove {base,net}_java dependencies from GYP client targets on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 3 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 | « chrome/chrome.gyp ('k') | content/content_tests.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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, # Use higher warning level. 7 'chromium_code': 1, # Use higher warning level.
8 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)', 8 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)',
9 'conditions': [ 9 'conditions': [
10 ['inside_chromium_build==0', { 10 ['inside_chromium_build==0', {
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 'sources': [ 273 'sources': [
274 'public/android/java/src/org/chromium/content/common/ISandboxedProce ssCallback.aidl', 274 'public/android/java/src/org/chromium/content/common/ISandboxedProce ssCallback.aidl',
275 'public/android/java/src/org/chromium/content/common/ISandboxedProcess Service.aidl', 275 'public/android/java/src/org/chromium/content/common/ISandboxedProcess Service.aidl',
276 ], 276 ],
277 'includes': [ '../build/java_aidl.gypi' ], 277 'includes': [ '../build/java_aidl.gypi' ],
278 }, 278 },
279 { 279 {
280 'target_name': 'content_java', 280 'target_name': 'content_java',
281 'type': 'none', 281 'type': 'none',
282 'dependencies': [ 282 'dependencies': [
283 '../base/base.gyp:base_java', 283 '../base/base.gyp:base',
284 '../net/net.gyp:net_java', 284 '../net/net.gyp:net',
285 'common_aidl', 285 'common_aidl',
286 'content_common', 286 'content_common',
287 ], 287 ],
288 'export_dependent_settings': [ 288 'export_dependent_settings': [
289 '../base/base.gyp:base_java', 289 '../base/base.gyp:base',
290 '../net/net.gyp:net_java', 290 '../net/net.gyp:net',
291 ], 291 ],
292 'variables': { 292 'variables': {
293 'package_name': 'content', 293 'package_name': 'content',
294 'java_in_dir': '../content/public/android/java', 294 'java_in_dir': '../content/public/android/java',
295 }, 295 },
296 'includes': [ '../build/java.gypi' ], 296 'includes': [ '../build/java.gypi' ],
297 }, 297 },
298 { 298 {
299 'target_name': 'content_jni_headers', 299 'target_name': 'content_jni_headers',
300 'type': 'none', 300 'type': 'none',
301 'includes': [ 'content_jni.gypi' ], 301 'includes': [ 'content_jni.gypi' ],
302 }, 302 },
303 ], 303 ],
304 }], # OS == "android" 304 }], # OS == "android"
305 ], 305 ],
306 } 306 }
OLDNEW
« no previous file with comments | « chrome/chrome.gyp ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698