Chromium Code Reviews| 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 import("//build/config/ui.gni") | 5 import("//build/config/ui.gni") |
| 6 | 6 |
| 7 if (is_android) { | 7 if (is_android) { |
| 8 import("//build/config/android/config.gni") | 8 import("//build/config/android/config.gni") |
| 9 import("//build/config/android/rules.gni") | 9 import("//build/config/android/rules.gni") |
| 10 } | 10 } |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 169 jinja_template("blimp_test_apk_manifest") { | 169 jinja_template("blimp_test_apk_manifest") { |
| 170 input = "app/android/javatests/AndroidManifest.xml.jinja2" | 170 input = "app/android/javatests/AndroidManifest.xml.jinja2" |
| 171 output = blimp_test_apk_manifest | 171 output = blimp_test_apk_manifest |
| 172 variables = jinja_variables | 172 variables = jinja_variables |
| 173 } | 173 } |
| 174 | 174 |
| 175 generate_jni("jni_headers") { | 175 generate_jni("jni_headers") { |
| 176 sources = [ | 176 sources = [ |
| 177 "app/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java", | 177 "app/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java", |
| 178 "app/android/java/src/org/chromium/blimp/BlimpView.java", | 178 "app/android/java/src/org/chromium/blimp/BlimpView.java", |
| 179 "app/android/java/src/org/chromium/blimp/input/WebInputBox.java", | 179 "app/android/java/src/org/chromium/blimp/input/ImeHelperDialog.java", |
| 180 "app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java", | 180 "app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java", |
| 181 "app/android/java/src/org/chromium/blimp/session/TabControlFeature.java", | 181 "app/android/java/src/org/chromium/blimp/session/TabControlFeature.java", |
| 182 "app/android/java/src/org/chromium/blimp/toolbar/Toolbar.java", | 182 "app/android/java/src/org/chromium/blimp/toolbar/Toolbar.java", |
| 183 ] | 183 ] |
| 184 | 184 |
| 185 jni_package = "blimp" | 185 jni_package = "blimp" |
| 186 } | 186 } |
| 187 | 187 |
| 188 android_resources("blimp_java_resources") { | 188 android_resources("blimp_java_resources") { |
| 189 resource_dirs = [ "app/android/java/res" ] | 189 resource_dirs = [ "app/android/java/res" ] |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 237 "values-th/android_blimp_strings.xml", | 237 "values-th/android_blimp_strings.xml", |
| 238 "values-tr/android_blimp_strings.xml", | 238 "values-tr/android_blimp_strings.xml", |
| 239 "values-uk/android_blimp_strings.xml", | 239 "values-uk/android_blimp_strings.xml", |
| 240 "values-vi/android_blimp_strings.xml", | 240 "values-vi/android_blimp_strings.xml", |
| 241 "values-zh-rCN/android_blimp_strings.xml", | 241 "values-zh-rCN/android_blimp_strings.xml", |
| 242 "values-zh-rTW/android_blimp_strings.xml", | 242 "values-zh-rTW/android_blimp_strings.xml", |
| 243 ] | 243 ] |
| 244 } | 244 } |
| 245 | 245 |
| 246 android_library("blimp_java") { | 246 android_library("blimp_java") { |
| 247 deps = [ | 247 deps = [ |
|
nyquist
2016/08/31 23:23:45
I think you want to add //third_party/android_tool
| |
| 248 ":blimp_java_resources", | 248 ":blimp_java_resources", |
| 249 "//base:base_java", | 249 "//base:base_java", |
| 250 "//blimp/client/core:core_java", | 250 "//blimp/client/core:core_java", |
| 251 "//blimp/client/public:public_headers_java", | 251 "//blimp/client/public:public_headers_java", |
| 252 "//third_party/android_tools:android_support_annotations_java", | 252 "//third_party/android_tools:android_support_annotations_java", |
| 253 | 253 |
| 254 # TODO(dtrainor): Remove the ui_java target once no more Android Toast | 254 # TODO(dtrainor): Remove the ui_java target once no more Android Toast |
| 255 # notifications are used. | 255 # notifications are used. |
| 256 "//ui/android:ui_java", | 256 "//ui/android:ui_java", |
| 257 google_play_services_library, | 257 google_play_services_library, |
| 258 ] | 258 ] |
| 259 | 259 |
| 260 java_files = [ | 260 java_files = [ |
| 261 "app/android/java/src/org/chromium/blimp/auth/RetryingTokenSource.java", | 261 "app/android/java/src/org/chromium/blimp/auth/RetryingTokenSource.java", |
| 262 "app/android/java/src/org/chromium/blimp/auth/TokenSource.java", | 262 "app/android/java/src/org/chromium/blimp/auth/TokenSource.java", |
| 263 "app/android/java/src/org/chromium/blimp/auth/TokenSourceImpl.java", | 263 "app/android/java/src/org/chromium/blimp/auth/TokenSourceImpl.java", |
| 264 "app/android/java/src/org/chromium/blimp/BlimpApplication.java", | 264 "app/android/java/src/org/chromium/blimp/BlimpApplication.java", |
| 265 "app/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java", | 265 "app/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java", |
| 266 "app/android/java/src/org/chromium/blimp/BlimpRendererActivity.java", | 266 "app/android/java/src/org/chromium/blimp/BlimpRendererActivity.java", |
| 267 "app/android/java/src/org/chromium/blimp/BlimpView.java", | 267 "app/android/java/src/org/chromium/blimp/BlimpView.java", |
| 268 "app/android/java/src/org/chromium/blimp/BrowserRestartActivity.java", | 268 "app/android/java/src/org/chromium/blimp/BrowserRestartActivity.java", |
| 269 "app/android/java/src/org/chromium/blimp/input/WebInputBox.java", | 269 "app/android/java/src/org/chromium/blimp/input/ImeEditText.java", |
| 270 "app/android/java/src/org/chromium/blimp/input/ImeHelperDialog.java", | |
| 270 "app/android/java/src/org/chromium/blimp/preferences/PreferencesUtil.java" , | 271 "app/android/java/src/org/chromium/blimp/preferences/PreferencesUtil.java" , |
| 271 "app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java", | 272 "app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java", |
| 272 "app/android/java/src/org/chromium/blimp/session/EngineInfo.java", | 273 "app/android/java/src/org/chromium/blimp/session/EngineInfo.java", |
| 273 "app/android/java/src/org/chromium/blimp/session/TabControlFeature.java", | 274 "app/android/java/src/org/chromium/blimp/session/TabControlFeature.java", |
| 274 "app/android/java/src/org/chromium/blimp/settings/AboutBlimpPreferences.ja va", | 275 "app/android/java/src/org/chromium/blimp/settings/AboutBlimpPreferences.ja va", |
| 275 "app/android/java/src/org/chromium/blimp/settings/Preferences.java", | 276 "app/android/java/src/org/chromium/blimp/settings/Preferences.java", |
| 276 "app/android/java/src/org/chromium/blimp/toolbar/Toolbar.java", | 277 "app/android/java/src/org/chromium/blimp/toolbar/Toolbar.java", |
| 277 "app/android/java/src/org/chromium/blimp/toolbar/ToolbarMenu.java", | 278 "app/android/java/src/org/chromium/blimp/toolbar/ToolbarMenu.java", |
| 278 "app/android/java/src/org/chromium/blimp/toolbar/UrlBar.java", | 279 "app/android/java/src/org/chromium/blimp/toolbar/UrlBar.java", |
| 279 ] | 280 ] |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 332 | 333 |
| 333 sources = [ | 334 sources = [ |
| 334 "app/android/blimp_app_jni_registrar.cc", | 335 "app/android/blimp_app_jni_registrar.cc", |
| 335 "app/android/blimp_app_jni_registrar.h", | 336 "app/android/blimp_app_jni_registrar.h", |
| 336 "app/android/blimp_client_session_android.cc", | 337 "app/android/blimp_client_session_android.cc", |
| 337 "app/android/blimp_client_session_android.h", | 338 "app/android/blimp_client_session_android.h", |
| 338 "app/android/blimp_library_loader.cc", | 339 "app/android/blimp_library_loader.cc", |
| 339 "app/android/blimp_library_loader.h", | 340 "app/android/blimp_library_loader.h", |
| 340 "app/android/blimp_view.cc", | 341 "app/android/blimp_view.cc", |
| 341 "app/android/blimp_view.h", | 342 "app/android/blimp_view.h", |
| 343 "app/android/ime_helper_dialog.cc", | |
| 344 "app/android/ime_helper_dialog.h", | |
| 342 "app/android/tab_control_feature_android.cc", | 345 "app/android/tab_control_feature_android.cc", |
| 343 "app/android/tab_control_feature_android.h", | 346 "app/android/tab_control_feature_android.h", |
| 344 "app/android/toolbar.cc", | 347 "app/android/toolbar.cc", |
| 345 "app/android/toolbar.h", | 348 "app/android/toolbar.h", |
| 346 "app/android/web_input_box.cc", | |
| 347 "app/android/web_input_box.h", | |
| 348 "app/user_agent.cc", | 349 "app/user_agent.cc", |
| 349 "app/user_agent.h", | 350 "app/user_agent.h", |
| 350 ] | 351 ] |
| 351 | 352 |
| 352 libs = [ "android" ] | 353 libs = [ "android" ] |
| 353 } | 354 } |
| 354 | 355 |
| 355 android_apk("blimp_apk") { | 356 android_apk("blimp_apk") { |
| 356 deps = [ | 357 deps = [ |
| 357 ":blimp_java", | 358 ":blimp_java", |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 369 instrumentation_test_apk("blimp_test_apk") { | 370 instrumentation_test_apk("blimp_test_apk") { |
| 370 apk_name = "BlimpTest" | 371 apk_name = "BlimpTest" |
| 371 apk_under_test = ":blimp_apk" | 372 apk_under_test = ":blimp_apk" |
| 372 android_manifest = blimp_test_apk_manifest | 373 android_manifest = blimp_test_apk_manifest |
| 373 android_manifest_dep = ":blimp_test_apk_manifest" | 374 android_manifest_dep = ":blimp_test_apk_manifest" |
| 374 deps = [ | 375 deps = [ |
| 375 ":blimp_test_java", | 376 ":blimp_test_java", |
| 376 ] | 377 ] |
| 377 } | 378 } |
| 378 } | 379 } |
| OLD | NEW |