Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

Side by Side Diff: blimp/client/BUILD.gn

Issue 2292343002: Hooking up Blimp IME with BlimpContents (Closed)
Patch Set: Fixed linux client Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | blimp/client/app/android/AndroidManifest.xml.jinja2 » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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/ImeHelperDialog.java",
180 "app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java", 179 "app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java",
181 "app/android/java/src/org/chromium/blimp/session/TabControlFeature.java", 180 "app/android/java/src/org/chromium/blimp/session/TabControlFeature.java",
182 "app/android/java/src/org/chromium/blimp/toolbar/Toolbar.java", 181 "app/android/java/src/org/chromium/blimp/toolbar/Toolbar.java",
183 ] 182 ]
184 183
185 jni_package = "blimp" 184 jni_package = "blimp"
186 } 185 }
187 186
188 android_resources("blimp_java_resources") { 187 android_resources("blimp_java_resources") {
189 resource_dirs = [ "app/android/java/res" ] 188 resource_dirs = [ "app/android/java/res" ]
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 ] 242 ]
244 } 243 }
245 244
246 android_library("blimp_java") { 245 android_library("blimp_java") {
247 deps = [ 246 deps = [
248 ":blimp_java_resources", 247 ":blimp_java_resources",
249 "//base:base_java", 248 "//base:base_java",
250 "//blimp/client/core:core_java", 249 "//blimp/client/core:core_java",
251 "//blimp/client/public:public_headers_java", 250 "//blimp/client/public:public_headers_java",
252 "//third_party/android_tools:android_support_annotations_java", 251 "//third_party/android_tools:android_support_annotations_java",
253 "//third_party/android_tools:android_support_v7_appcompat_java",
254 252
255 # TODO(dtrainor): Remove the ui_java target once no more Android Toast 253 # TODO(dtrainor): Remove the ui_java target once no more Android Toast
256 # notifications are used. 254 # notifications are used.
257 "//ui/android:ui_java", 255 "//ui/android:ui_java",
258 google_play_services_library, 256 google_play_services_library,
259 ] 257 ]
260 258
261 java_files = [ 259 java_files = [
262 "app/android/java/src/org/chromium/blimp/auth/RetryingTokenSource.java", 260 "app/android/java/src/org/chromium/blimp/auth/RetryingTokenSource.java",
263 "app/android/java/src/org/chromium/blimp/auth/TokenSource.java", 261 "app/android/java/src/org/chromium/blimp/auth/TokenSource.java",
264 "app/android/java/src/org/chromium/blimp/auth/TokenSourceImpl.java", 262 "app/android/java/src/org/chromium/blimp/auth/TokenSourceImpl.java",
265 "app/android/java/src/org/chromium/blimp/BlimpApplication.java", 263 "app/android/java/src/org/chromium/blimp/BlimpApplication.java",
266 "app/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java", 264 "app/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java",
267 "app/android/java/src/org/chromium/blimp/BlimpRendererActivity.java", 265 "app/android/java/src/org/chromium/blimp/BlimpRendererActivity.java",
268 "app/android/java/src/org/chromium/blimp/BlimpView.java", 266 "app/android/java/src/org/chromium/blimp/BlimpView.java",
269 "app/android/java/src/org/chromium/blimp/BrowserRestartActivity.java", 267 "app/android/java/src/org/chromium/blimp/BrowserRestartActivity.java",
270 "app/android/java/src/org/chromium/blimp/input/ImeEditText.java",
271 "app/android/java/src/org/chromium/blimp/input/ImeHelperDialog.java",
272 "app/android/java/src/org/chromium/blimp/preferences/PreferencesUtil.java" , 268 "app/android/java/src/org/chromium/blimp/preferences/PreferencesUtil.java" ,
273 "app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java", 269 "app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java",
274 "app/android/java/src/org/chromium/blimp/session/EngineInfo.java", 270 "app/android/java/src/org/chromium/blimp/session/EngineInfo.java",
275 "app/android/java/src/org/chromium/blimp/session/TabControlFeature.java", 271 "app/android/java/src/org/chromium/blimp/session/TabControlFeature.java",
276 "app/android/java/src/org/chromium/blimp/settings/AboutBlimpPreferences.ja va", 272 "app/android/java/src/org/chromium/blimp/settings/AboutBlimpPreferences.ja va",
277 "app/android/java/src/org/chromium/blimp/settings/Preferences.java", 273 "app/android/java/src/org/chromium/blimp/settings/Preferences.java",
278 "app/android/java/src/org/chromium/blimp/toolbar/Toolbar.java", 274 "app/android/java/src/org/chromium/blimp/toolbar/Toolbar.java",
279 "app/android/java/src/org/chromium/blimp/toolbar/ToolbarMenu.java", 275 "app/android/java/src/org/chromium/blimp/toolbar/ToolbarMenu.java",
280 "app/android/java/src/org/chromium/blimp/toolbar/UrlBar.java", 276 "app/android/java/src/org/chromium/blimp/toolbar/UrlBar.java",
281 ] 277 ]
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 330
335 sources = [ 331 sources = [
336 "app/android/blimp_app_jni_registrar.cc", 332 "app/android/blimp_app_jni_registrar.cc",
337 "app/android/blimp_app_jni_registrar.h", 333 "app/android/blimp_app_jni_registrar.h",
338 "app/android/blimp_client_session_android.cc", 334 "app/android/blimp_client_session_android.cc",
339 "app/android/blimp_client_session_android.h", 335 "app/android/blimp_client_session_android.h",
340 "app/android/blimp_library_loader.cc", 336 "app/android/blimp_library_loader.cc",
341 "app/android/blimp_library_loader.h", 337 "app/android/blimp_library_loader.h",
342 "app/android/blimp_view.cc", 338 "app/android/blimp_view.cc",
343 "app/android/blimp_view.h", 339 "app/android/blimp_view.h",
344 "app/android/ime_helper_dialog.cc",
345 "app/android/ime_helper_dialog.h",
346 "app/android/tab_control_feature_android.cc", 340 "app/android/tab_control_feature_android.cc",
347 "app/android/tab_control_feature_android.h", 341 "app/android/tab_control_feature_android.h",
348 "app/android/toolbar.cc", 342 "app/android/toolbar.cc",
349 "app/android/toolbar.h", 343 "app/android/toolbar.h",
350 "app/user_agent.cc", 344 "app/user_agent.cc",
351 "app/user_agent.h", 345 "app/user_agent.h",
352 ] 346 ]
353 347
354 libs = [ "android" ] 348 libs = [ "android" ]
355 } 349 }
(...skipping 15 matching lines...) Expand all
371 instrumentation_test_apk("blimp_test_apk") { 365 instrumentation_test_apk("blimp_test_apk") {
372 apk_name = "BlimpTest" 366 apk_name = "BlimpTest"
373 apk_under_test = ":blimp_apk" 367 apk_under_test = ":blimp_apk"
374 android_manifest = blimp_test_apk_manifest 368 android_manifest = blimp_test_apk_manifest
375 android_manifest_dep = ":blimp_test_apk_manifest" 369 android_manifest_dep = ":blimp_test_apk_manifest"
376 deps = [ 370 deps = [
377 ":blimp_test_java", 371 ":blimp_test_java",
378 ] 372 ]
379 } 373 }
380 } 374 }
OLDNEW
« no previous file with comments | « no previous file | blimp/client/app/android/AndroidManifest.xml.jinja2 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698