Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 211 {'target_name': 'content_worker', | 211 {'target_name': 'content_worker', |
| 212 'type': 'none', | 212 'type': 'none', |
| 213 'dependencies': ['content'], | 213 'dependencies': ['content'], |
| 214 }, | 214 }, |
| 215 ], | 215 ], |
| 216 }, | 216 }, |
| 217 ], | 217 ], |
| 218 ['OS == "android"', { | 218 ['OS == "android"', { |
| 219 'targets': [ | 219 'targets': [ |
| 220 { | 220 { |
| 221 'target_name': 'content_jni', | |
|
Yaron
2012/06/11 19:46:22
Remove this. You already have content_jni_headers
michaelbai
2012/06/11 20:30:16
Done.
| |
| 222 'type': 'none', | |
| 223 'includes': [ 'content_jni.gypi' ], | |
| 224 }, | |
| 225 { | |
| 226 'target_name': 'common_aidl', | |
|
Yaron
2012/06/11 19:46:22
You shouldn't need to duplicate this. It's already
michaelbai
2012/06/11 20:30:16
Removed from content_common, as all targets are de
| |
| 227 'type': 'none', | |
| 228 'variables': { | |
| 229 'aidl_interface_file': '../content/public/android/java/org/chromium/c ontent/common/common.aidl', | |
| 230 }, | |
| 231 'sources': [ | |
| 232 '../content/public/android/java/org/chromium/content/common/ISandboxe dProcessCallback.aidl', | |
| 233 '../content/public/android/java/org/chromium/content/common/ISandboxe dProcessService.aidl', | |
| 234 ], | |
| 235 'includes': [ '../build/java_aidl.gypi' ], | |
| 236 }, | |
| 237 { | |
| 221 'target_name': 'content_java', | 238 'target_name': 'content_java', |
| 222 'type': 'none', | 239 'type': 'none', |
| 223 'dependencies': ['../base/base.gyp:base_java'], | 240 'dependencies': ['../base/base.gyp:base_java'], |
| 224 'variables': { | 241 'variables': { |
| 225 'package_name': 'content', | 242 'package_name': 'content', |
| 226 'java_in_dir': '../content/public/android/java', | 243 'java_in_dir': '../content/public/android/java', |
| 227 }, | 244 }, |
| 228 'includes': [ '../build/java.gypi' ], | 245 'includes': [ '../build/java.gypi' ], |
| 229 }, | 246 }, |
| 230 { | 247 { |
| 231 'target_name': 'content_jni_headers', | 248 'target_name': 'content_jni_headers', |
| 232 'type': 'none', | 249 'type': 'none', |
| 233 'includes': [ 'content_jni.gypi' ], | 250 'includes': [ 'content_jni.gypi' ], |
| 234 }, | 251 }, |
| 235 ], | 252 ], |
| 236 }], # OS == "android" | 253 }], # OS == "android" |
| 237 ], | 254 ], |
| 238 } | 255 } |
| OLD | NEW |