| OLD | NEW | 
|---|
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 if (is_android) { | 5 if (is_android) { | 
| 6   import("//build/config/android/config.gni") | 6   import("//build/config/android/config.gni") | 
| 7   import("//build/config/android/rules.gni") | 7   import("//build/config/android/rules.gni") | 
| 8 } | 8 } | 
| 9 | 9 | 
| 10 shared_library("blimp_client") { | 10 shared_library("blimp_client") { | 
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 134       "values-vi/android_blimp_strings.xml", | 134       "values-vi/android_blimp_strings.xml", | 
| 135       "values-zh-rCN/android_blimp_strings.xml", | 135       "values-zh-rCN/android_blimp_strings.xml", | 
| 136       "values-zh-rTW/android_blimp_strings.xml", | 136       "values-zh-rTW/android_blimp_strings.xml", | 
| 137     ] | 137     ] | 
| 138   } | 138   } | 
| 139 | 139 | 
| 140   android_library("blimp_java") { | 140   android_library("blimp_java") { | 
| 141     deps = [ | 141     deps = [ | 
| 142       ":blimp_java_resources", | 142       ":blimp_java_resources", | 
| 143       "//base:base_java", | 143       "//base:base_java", | 
|  | 144       google_play_services_library, | 
| 144     ] | 145     ] | 
| 145 | 146 | 
| 146     java_files = [ | 147     java_files = [ | 
|  | 148       "android/java/src/org/chromium/blimp/auth/RetryingTokenSource.java", | 
|  | 149       "android/java/src/org/chromium/blimp/auth/TokenSource.java", | 
|  | 150       "android/java/src/org/chromium/blimp/auth/TokenSourceImpl.java", | 
| 147       "android/java/src/org/chromium/blimp/BlimpApplication.java", | 151       "android/java/src/org/chromium/blimp/BlimpApplication.java", | 
| 148       "android/java/src/org/chromium/blimp/BlimpLibraryLoader.java", | 152       "android/java/src/org/chromium/blimp/BlimpLibraryLoader.java", | 
| 149       "android/java/src/org/chromium/blimp/BlimpRendererActivity.java", | 153       "android/java/src/org/chromium/blimp/BlimpRendererActivity.java", | 
| 150       "android/java/src/org/chromium/blimp/BlimpView.java", | 154       "android/java/src/org/chromium/blimp/BlimpView.java", | 
| 151     ] | 155     ] | 
| 152   } | 156   } | 
| 153 | 157 | 
| 154   android_library("blimp_test_java") { | 158   android_library("blimp_test_java") { | 
| 155     testonly = true | 159     testonly = true | 
| 156 | 160 | 
| 157     deps = [ | 161     deps = [ | 
| 158       ":blimp_java", | 162       ":blimp_java", | 
| 159       ":blimp_java_resources", | 163       ":blimp_java_resources", | 
| 160       "//base:base_java", | 164       "//base:base_java", | 
| 161       "//base:base_java_test_support", | 165       "//base:base_java_test_support", | 
|  | 166       google_play_services_library, | 
| 162     ] | 167     ] | 
| 163 | 168 | 
| 164     java_files = [ "android/javatests/src/org/chromium/blimp/DummyTest.java" ] | 169     java_files = [ | 
|  | 170       "android/javatests/src/org/chromium/blimp/auth/MockTokenSource.java", | 
|  | 171       "android/javatests/src/org/chromium/blimp/auth/RetryingTokenSourceTest.jav
     a", | 
|  | 172     ] | 
| 165   } | 173   } | 
| 166 | 174 | 
| 167   android_apk("blimp_apk") { | 175   android_apk("blimp_apk") { | 
| 168     deps = [ | 176     deps = [ | 
| 169       ":blimp_apk_manifest", | 177       ":blimp_apk_manifest", | 
| 170       ":blimp_java", | 178       ":blimp_java", | 
| 171       ":blimp_java_resources", | 179       ":blimp_java_resources", | 
| 172       ":blimp_client", | 180       ":blimp_client", | 
|  | 181       ":blimp_java", | 
| 173       "//base:base_java", | 182       "//base:base_java", | 
|  | 183       google_play_services_resources, | 
| 174     ] | 184     ] | 
| 175     apk_name = "Blimp" | 185     apk_name = "Blimp" | 
| 176     android_manifest = blimp_apk_manifest | 186     android_manifest = blimp_apk_manifest | 
| 177     native_libs = [ "libblimp_client.so" ] | 187     native_libs = [ "libblimp_client.so" ] | 
| 178   } | 188   } | 
| 179 | 189 | 
| 180   instrumentation_test_apk("blimp_test_apk") { | 190   instrumentation_test_apk("blimp_test_apk") { | 
| 181     apk_name = "BlimpTest" | 191     apk_name = "BlimpTest" | 
| 182     apk_under_test = ":blimp_apk" | 192     apk_under_test = ":blimp_apk" | 
| 183     android_manifest = blimp_test_apk_manifest | 193     android_manifest = blimp_test_apk_manifest | 
| 184     deps = [ | 194     deps = [ | 
| 185       ":blimp_test_apk_manifest", | 195       ":blimp_test_apk_manifest", | 
| 186       ":blimp_test_java", | 196       ":blimp_test_java", | 
|  | 197       google_play_services_resources, | 
| 187     ] | 198     ] | 
| 188   } | 199   } | 
| 189 } | 200 } | 
| OLD | NEW | 
|---|