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, | 7 'chromium_code': 1, |
8 }, | 8 }, |
9 'includes': [ | 9 'includes': [ |
10 '../build/win_precompile.gypi', | 10 '../build/win_precompile.gypi', |
(...skipping 945 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
956 'variables': { | 956 'variables': { |
957 'jni_gen_dir': 'base', | 957 'jni_gen_dir': 'base', |
958 }, | 958 }, |
959 'includes': [ '../build/jni_generator.gypi' ], | 959 'includes': [ '../build/jni_generator.gypi' ], |
960 }, | 960 }, |
961 { | 961 { |
962 'target_name': 'base_java', | 962 'target_name': 'base_java', |
963 'type': 'none', | 963 'type': 'none', |
964 'variables': { | 964 'variables': { |
965 'package_name': 'base', | 965 'package_name': 'base', |
966 'java_in_dir': 'android/java', | 966 'java_in_dir': 'android/java', |
Yaron
2012/09/12 20:47:01
Please make the change here as well
| |
967 }, | 967 }, |
968 'includes': [ '../build/java.gypi' ], | 968 'includes': [ '../build/java.gypi' ], |
969 }, | 969 }, |
970 { | 970 { |
971 'target_name': 'base_java_test_support', | 971 'target_name': 'base_java_test_support', |
972 'type': 'none', | 972 'type': 'none', |
973 'dependencies': [ | 973 'dependencies': [ |
974 'base_java', | 974 'base_java', |
975 ], | 975 ], |
976 'variables': { | 976 'variables': { |
977 'package_name': 'base_javatests', | 977 'package_name': 'base_javatests', |
978 'java_in_dir': 'android/javatests', | 978 'java_in_dir': '../base/android/javatests', |
979 }, | 979 }, |
980 'includes': [ '../build/java.gypi' ], | 980 'includes': [ '../build/java.gypi' ], |
981 }, | 981 }, |
982 ], | 982 ], |
983 }], | 983 }], |
984 ['OS == "win"', { | 984 ['OS == "win"', { |
985 'targets': [ | 985 'targets': [ |
986 { | 986 { |
987 'target_name': 'debug_message', | 987 'target_name': 'debug_message', |
988 'type': 'executable', | 988 'type': 'executable', |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1051 '--result', '<@(_outputs)', | 1051 '--result', '<@(_outputs)', |
1052 '--isolate', 'base_unittests.isolate', | 1052 '--isolate', 'base_unittests.isolate', |
1053 ], | 1053 ], |
1054 }, | 1054 }, |
1055 ], | 1055 ], |
1056 }, | 1056 }, |
1057 ], | 1057 ], |
1058 }], | 1058 }], |
1059 ], | 1059 ], |
1060 } | 1060 } |
OLD | NEW |