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

Side by Side Diff: build/config/android/config.gni

Issue 2298093008: android webview: Upstream android 7 glue layer (Closed)
Patch Set: 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 | « android_webview/glue/java/src/com/android/webview/chromium/WebViewDelegateFactory.java ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 # This file contains common system config stuff for the Android build. 5 # This file contains common system config stuff for the Android build.
6 6
7 if (is_android) { 7 if (is_android) {
8 assert(rebase_path("//", root_build_dir) == "../../", 8 assert(rebase_path("//", root_build_dir) == "../../",
9 "Android output directory must be nested 2 levels within src/ (" + 9 "Android output directory must be nested 2 levels within src/ (" +
10 "e.g.: out-gn/Debug). http://crbug.com/412935") 10 "e.g.: out-gn/Debug). http://crbug.com/412935")
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 google_play_services_library = 55 google_play_services_library =
56 "//third_party/android_tools:google_play_services_default_java" 56 "//third_party/android_tools:google_play_services_default_java"
57 } 57 }
58 58
59 if (!defined(google_play_services_resources)) { 59 if (!defined(google_play_services_resources)) {
60 google_play_services_resources = 60 google_play_services_resources =
61 "//third_party/android_tools:google_play_services_default_resources" 61 "//third_party/android_tools:google_play_services_default_resources"
62 } 62 }
63 63
64 webview_public_framework_jar = 64 webview_public_framework_jar =
65 "//third_party/android_platform/webview/frameworks_6.0.jar" 65 "//third_party/android_platform/webview/frameworks_7.0.0_r1.jar"
66 if (!defined(webview_framework_jar)) { 66 if (!defined(webview_framework_jar)) {
67 webview_framework_jar = webview_public_framework_jar 67 webview_framework_jar = webview_public_framework_jar
68 } 68 }
69 69
70 declare_args() { 70 declare_args() {
71 android_ndk_root = default_android_ndk_root 71 android_ndk_root = default_android_ndk_root
72 android_ndk_version = default_android_ndk_version 72 android_ndk_version = default_android_ndk_version
73 android_ndk_major_version = default_android_ndk_major_version 73 android_ndk_major_version = default_android_ndk_major_version
74 74
75 android_sdk_root = default_android_sdk_root 75 android_sdk_root = default_android_sdk_root
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 "//build/toolchain/android:${android_secondary_abi_cpu}" 323 "//build/toolchain/android:${android_secondary_abi_cpu}"
324 } 324 }
325 } 325 }
326 } 326 }
327 327
328 declare_args() { 328 declare_args() {
329 # Enables used resource whitelist generation. Set for official builds only 329 # Enables used resource whitelist generation. Set for official builds only
330 # as a large amount of build output is generated. 330 # as a large amount of build output is generated.
331 enable_resource_whitelist_generation = is_android && is_official_build 331 enable_resource_whitelist_generation = is_android && is_official_build
332 } 332 }
OLDNEW
« no previous file with comments | « android_webview/glue/java/src/com/android/webview/chromium/WebViewDelegateFactory.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698