| 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 'variables': { | 9 'variables': { |
| 10 'conditions': [ | 10 'conditions': [ |
| (...skipping 1893 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1904 'manifest_package_name': 'org.chromium.chromoting', | 1904 'manifest_package_name': 'org.chromium.chromoting', |
| 1905 'native_lib_target': 'libremoting_client_jni', | 1905 'native_lib_target': 'libremoting_client_jni', |
| 1906 'java_in_dir': 'android/java', | 1906 'java_in_dir': 'android/java', |
| 1907 'additional_res_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/remoting/androi
d/res' ], | 1907 'additional_res_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/remoting/androi
d/res' ], |
| 1908 'additional_input_paths': [ | 1908 'additional_input_paths': [ |
| 1909 '<(PRODUCT_DIR)/obj/remoting/remoting_android_resources.actions_ru
les_copies.stamp', | 1909 '<(PRODUCT_DIR)/obj/remoting/remoting_android_resources.actions_ru
les_copies.stamp', |
| 1910 ], | 1910 ], |
| 1911 }, | 1911 }, |
| 1912 'includes': [ '../build/java_apk.gypi' ], | 1912 'includes': [ '../build/java_apk.gypi' ], |
| 1913 }, # end of target 'remoting_apk' | 1913 }, # end of target 'remoting_apk' |
| 1914 { |
| 1915 # remoting_apk creates a .jar file as a side effect. Any Java targets |
| 1916 # that need that .jar in their classpath should depend on this target. |
| 1917 'target_name': 'remoting_apk_java', |
| 1918 'type': 'none', |
| 1919 'dependencies': [ |
| 1920 'remoting_apk', |
| 1921 ], |
| 1922 'includes': [ '../build/apk_fake_jar.gypi' ], |
| 1923 }, # end of target 'remoting_apk_java' |
| 1924 { |
| 1925 'target_name': 'remoting_test_apk', |
| 1926 'type': 'none', |
| 1927 'dependencies': [ |
| 1928 '../base/base.gyp:base_java_test_support', |
| 1929 'remoting_apk_java', |
| 1930 ], |
| 1931 'variables': { |
| 1932 'apk_name': 'ChromotingTest', |
| 1933 'java_in_dir': 'android/javatests', |
| 1934 'is_test_apk': 1, |
| 1935 }, |
| 1936 'includes': [ '../build/java_apk.gypi' ], |
| 1937 }, # end of target 'remoting_test_apk' |
| 1914 ], # end of 'targets' | 1938 ], # end of 'targets' |
| 1915 }], # 'OS=="android"' | 1939 }], # 'OS=="android"' |
| 1916 | 1940 |
| 1917 ['OS=="android" and gtest_target_type=="shared_library"', { | 1941 ['OS=="android" and gtest_target_type=="shared_library"', { |
| 1918 'targets': [ | 1942 'targets': [ |
| 1919 { | 1943 { |
| 1920 'target_name': 'remoting_unittests_apk', | 1944 'target_name': 'remoting_unittests_apk', |
| 1921 'type': 'none', | 1945 'type': 'none', |
| 1922 'dependencies': [ | 1946 'dependencies': [ |
| 1923 'remoting_unittests', | 1947 'remoting_unittests', |
| (...skipping 1098 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3022 '../base/allocator/allocator.gyp:allocator', | 3046 '../base/allocator/allocator.gyp:allocator', |
| 3023 ], | 3047 ], |
| 3024 }, | 3048 }, |
| 3025 ], | 3049 ], |
| 3026 ], | 3050 ], |
| 3027 }], # end of 'toolkit_uses_gtk == 1' | 3051 }], # end of 'toolkit_uses_gtk == 1' |
| 3028 ], # end of 'conditions' | 3052 ], # end of 'conditions' |
| 3029 }, # end of target 'remoting_unittests' | 3053 }, # end of target 'remoting_unittests' |
| 3030 ], # end of targets | 3054 ], # end of targets |
| 3031 } | 3055 } |
| OLD | NEW |