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

Side by Side Diff: device/vibration/vibration.gyp

Issue 1127043006: GYP dependencies for JNI _java targets moved to device targets that require them. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« content/content.gyp ('K') | « device/device_tests.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 26 matching lines...) Expand all
37 'android/vibration_jni_registrar.cc', 37 'android/vibration_jni_registrar.cc',
38 'android/vibration_jni_registrar.h', 38 'android/vibration_jni_registrar.h',
39 'vibration_manager_impl.h', 39 'vibration_manager_impl.h',
40 'vibration_manager_impl_android.cc', 40 'vibration_manager_impl_android.cc',
41 'vibration_manager_impl_android.h', 41 'vibration_manager_impl_android.h',
42 'vibration_manager_impl_default.cc', 42 'vibration_manager_impl_default.cc',
43 ], 43 ],
44 'conditions': [ 44 'conditions': [
45 ['OS == "android"', { 45 ['OS == "android"', {
46 'dependencies': [ 46 'dependencies': [
47 'device_vibration_java',
47 'device_vibration_jni_headers', 48 'device_vibration_jni_headers',
48 ], 49 ],
49 'sources!': [ 50 'sources!': [
50 'vibration_manager_impl_default.cc', 51 'vibration_manager_impl_default.cc',
51 ], 52 ],
52 }], 53 }],
53 ], 54 ],
54 }, 55 },
55 ], 56 ],
56 'conditions': [ 57 'conditions': [
(...skipping 18 matching lines...) Expand all
75 ], 76 ],
76 'variables': { 77 'variables': {
77 'java_in_dir': '../../device/vibration/android/java', 78 'java_in_dir': '../../device/vibration/android/java',
78 }, 79 },
79 'includes': [ '../../build/java.gypi' ], 80 'includes': [ '../../build/java.gypi' ],
80 }, 81 },
81 ], 82 ],
82 }], 83 }],
83 ], 84 ],
84 } 85 }
OLDNEW
« content/content.gyp ('K') | « device/device_tests.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698