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

Side by Side Diff: content/content.gyp

Issue 10855060: Make java_aidl targets export include directories (Closed) Base URL: http://git.chromium.org/chromium/src.git@ant
Patch Set: Created 8 years, 4 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
« no previous file with comments | « build/java_aidl.gypi ('k') | content/public/android/java/content.xml » ('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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 }, 223 },
224 ], 224 ],
225 }, 225 },
226 ], 226 ],
227 ['OS == "android"', { 227 ['OS == "android"', {
228 'targets': [ 228 'targets': [
229 { 229 {
230 'target_name': 'common_aidl', 230 'target_name': 'common_aidl',
231 'type': 'none', 231 'type': 'none',
232 'variables': { 232 'variables': {
233 'package_name': 'content',
233 'aidl_interface_file': 'public/android/java/src/org/chromium/content/ common/common.aidl', 234 'aidl_interface_file': 'public/android/java/src/org/chromium/content/ common/common.aidl',
234 }, 235 },
235 'sources': [ 236 'sources': [
236 'public/android/java/src/org/chromium/content/common/ISandboxedProces sCallback.aidl', 237 'public/android/java/src/org/chromium/content/common/ISandboxedProces sCallback.aidl',
237 'public/android/java/src/org/chromium/content/common/ISandboxedProces sService.aidl', 238 'public/android/java/src/org/chromium/content/common/ISandboxedProces sService.aidl',
238 ], 239 ],
239 'includes': [ '../build/java_aidl.gypi' ], 240 'includes': [ '../build/java_aidl.gypi' ],
240 }, 241 },
241 { 242 {
242 'target_name': 'content_java', 243 'target_name': 'content_java',
243 'type': 'none', 244 'type': 'none',
244 'dependencies': [ 245 'dependencies': [
245 '../base/base.gyp:base_java', 246 '../base/base.gyp:base_java',
246 '../net/net.gyp:net_java', 247 '../net/net.gyp:net_java',
248 'common_aidl',
247 'content_common', 249 'content_common',
248 ], 250 ],
249 'export_dependent_settings': [ 251 'export_dependent_settings': [
250 '../base/base.gyp:base_java', 252 '../base/base.gyp:base_java',
251 '../net/net.gyp:net_java', 253 '../net/net.gyp:net_java',
252 ], 254 ],
253 'variables': { 255 'variables': {
254 'package_name': 'content', 256 'package_name': 'content',
255 'java_in_dir': '../content/public/android/java', 257 'java_in_dir': '../content/public/android/java',
256 }, 258 },
257 'includes': [ '../build/java.gypi' ], 259 'includes': [ '../build/java.gypi' ],
258 }, 260 },
259 { 261 {
260 'target_name': 'content_jni_headers', 262 'target_name': 'content_jni_headers',
261 'type': 'none', 263 'type': 'none',
262 'includes': [ 'content_jni.gypi' ], 264 'includes': [ 'content_jni.gypi' ],
263 }, 265 },
264 ], 266 ],
265 }], # OS == "android" 267 }], # OS == "android"
266 ], 268 ],
267 } 269 }
OLDNEW
« no previous file with comments | « build/java_aidl.gypi ('k') | content/public/android/java/content.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698