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

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: Address Peter's comment 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
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 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 'sources': [ 236 'sources': [
237 'public/android/java/src/org/chromium/content/common/ISandboxedProces sCallback.aidl', 237 'public/android/java/src/org/chromium/content/common/ISandboxedProces sCallback.aidl',
238 'public/android/java/src/org/chromium/content/common/ISandboxedProces sService.aidl', 238 'public/android/java/src/org/chromium/content/common/ISandboxedProces sService.aidl',
239 ], 239 ],
240 'includes': [ '../build/java_aidl.gypi' ], 240 'includes': [ '../build/java_aidl.gypi' ],
241 }, 241 },
242 { 242 {
243 'target_name': 'content_java', 243 'target_name': 'content_java',
244 'type': 'none', 244 'type': 'none',
245 'dependencies': [ 245 'dependencies': [
246 '../base/base.gyp:base_java', 246 '../net/net.gyp:net',
cjhopman 2012/09/06 20:29:25 I believe that the dependency on base_java here wa
Philippe 2012/09/07 09:45:57 These changes were pretty random indeed. The code
247 '../net/net.gyp:net_java',
248 'common_aidl', 247 'common_aidl',
249 'content_common', 248 'content_common',
250 ], 249 ],
251 'export_dependent_settings': [
252 '../base/base.gyp:base_java',
253 '../net/net.gyp:net_java',
cjhopman 2012/09/06 20:29:25 Removing these exports would make an apk that spec
Philippe 2012/09/07 09:45:57 I don't think I had strong reasons to do this. I f
254 ],
255 'variables': { 250 'variables': {
256 'package_name': 'content', 251 'package_name': 'content',
257 'java_in_dir': '../content/public/android/java', 252 'java_in_dir': '../content/public/android/java',
258 }, 253 },
259 'includes': [ '../build/java.gypi' ], 254 'includes': [ '../build/java.gypi' ],
260 }, 255 },
261 { 256 {
262 'target_name': 'content_jni_headers', 257 'target_name': 'content_jni_headers',
263 'type': 'none', 258 'type': 'none',
264 'includes': [ 'content_jni.gypi' ], 259 'includes': [ 'content_jni.gypi' ],
265 }, 260 },
266 ], 261 ],
267 }], # OS == "android" 262 }], # OS == "android"
268 ], 263 ],
269 } 264 }
OLDNEW
« build/apk_test.gypi ('K') | « chrome/chrome.gyp ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698