| OLD | NEW |
| 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 'conditions': [ | 6 'conditions': [ |
| 7 ['OS=="android"', { | 7 ['OS=="android"', { |
| 8 'targets': [ | 8 'targets': [ |
| 9 { | 9 { |
| 10 'target_name': 'remoting_jni_headers', | 10 'target_name': 'remoting_jni_headers', |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 '<(branding_path)', | 72 '<(branding_path)', |
| 73 ], | 73 ], |
| 74 'outputs': [ | 74 'outputs': [ |
| 75 '<(SHARED_INTERMEDIATE_DIR)/remoting/android/<(RULE_INPUT_ROOT)', | 75 '<(SHARED_INTERMEDIATE_DIR)/remoting/android/<(RULE_INPUT_ROOT)', |
| 76 ], | 76 ], |
| 77 'action': [ | 77 'action': [ |
| 78 'python', '<(remoting_localize_path)', | 78 'python', '<(remoting_localize_path)', |
| 79 '--variables', '<(branding_path)', | 79 '--variables', '<(branding_path)', |
| 80 '--template', '<(RULE_INPUT_PATH)', | 80 '--template', '<(RULE_INPUT_PATH)', |
| 81 '--locale_output', '<@(_outputs)', | 81 '--locale_output', '<@(_outputs)', |
| 82 '--define', 'ENABLE_CARDBOARD=<(enable_cardboard)', |
| 82 'en', | 83 'en', |
| 83 ], | 84 ], |
| 84 }], | 85 }], |
| 85 }, # end of target 'remoting_apk_manifest' | 86 }, # end of target 'remoting_apk_manifest' |
| 86 { | 87 { |
| 87 'target_name': 'remoting_android_client_java', | 88 'target_name': 'remoting_android_client_java', |
| 88 'type': 'none', | 89 'type': 'none', |
| 89 'variables': { | 90 'variables': { |
| 90 'java_in_dir': 'android/java', | 91 'java_in_dir': 'android/java', |
| 91 'has_java_resources': 1, | 92 'has_java_resources': 1, |
| 92 'R_package': 'org.chromium.chromoting', | 93 'R_package': 'org.chromium.chromoting', |
| 93 'R_package_relpath': 'org/chromium/chromoting', | 94 'R_package_relpath': 'org/chromium/chromoting', |
| 94 'res_extra_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res
' ], | 95 'res_extra_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res
' ], |
| 95 'res_extra_files': [ | 96 'res_extra_files': [ |
| 96 '<!@pymod_do_main(grit_info <@(grit_defines) --outputs "<(SHARED_I
NTERMEDIATE_DIR)" resources/remoting_strings.grd)', | 97 '<!@pymod_do_main(grit_info <@(grit_defines) --outputs "<(SHARED_I
NTERMEDIATE_DIR)" resources/remoting_strings.grd)', |
| 97 ], | 98 ], |
| 98 }, | 99 }, |
| 99 'dependencies': [ | 100 'dependencies': [ |
| 100 'remoting_android_resources', | 101 'remoting_android_resources', |
| 101 '../base/base.gyp:base_java', | 102 '../base/base.gyp:base_java', |
| 102 '../ui/android/ui_android.gyp:ui_java', | 103 '../ui/android/ui_android.gyp:ui_java', |
| 103 '../third_party/android_tools/android_tools.gyp:android_support_v7_a
ppcompat_javalib', | 104 '../third_party/android_tools/android_tools.gyp:android_support_v7_a
ppcompat_javalib', |
| 104 '../third_party/android_tools/android_tools.gyp:android_support_v7_m
ediarouter_javalib', | 105 '../third_party/android_tools/android_tools.gyp:android_support_v7_m
ediarouter_javalib', |
| 105 '../third_party/android_tools/android_tools.gyp:android_support_v13_
javalib', | 106 '../third_party/android_tools/android_tools.gyp:android_support_v13_
javalib', |
| 106 '../third_party/android_tools/android_tools.gyp:google_play_services
_javalib', | 107 '../third_party/android_tools/android_tools.gyp:google_play_services
_javalib', |
| 108 '../third_party/cardboard-java/cardboard.gyp:cardboard_jar', |
| 107 ], | 109 ], |
| 108 'includes': [ '../build/java.gypi' ], | 110 'includes': [ '../build/java.gypi' ], |
| 109 'conditions' : [ | 111 'conditions' : [ |
| 110 ['enable_cast==1', { | 112 ['enable_cast==1', { |
| 111 'variables': { | 113 'variables': { |
| 112 'additional_src_dirs': [ | 114 'additional_src_dirs': [ |
| 113 'android/cast', | 115 'android/cast', |
| 114 ], | 116 ], |
| 115 }, | 117 }, |
| 116 }], | 118 }], |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 ], | 163 ], |
| 162 'variables': { | 164 'variables': { |
| 163 'test_suite_name': 'remoting_unittests', | 165 'test_suite_name': 'remoting_unittests', |
| 164 }, | 166 }, |
| 165 'includes': [ '../build/apk_test.gypi' ], | 167 'includes': [ '../build/apk_test.gypi' ], |
| 166 }, | 168 }, |
| 167 ], | 169 ], |
| 168 }], # 'OS=="android" | 170 }], # 'OS=="android" |
| 169 ], # end of 'conditions' | 171 ], # end of 'conditions' |
| 170 } | 172 } |
| OLD | NEW |