| 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/android/config.gni") | 5 import("//build/config/android/config.gni") |
| 6 import("//build/config/android/rules.gni") | 6 import("//build/config/android/rules.gni") |
| 7 import("generate_resource_rewriter.gni") | 7 import("generate_resource_rewriter.gni") |
| 8 import("glue.gni") | 8 import("glue.gni") |
| 9 | 9 |
| 10 # There are two copies of this file: one upstream and one downstream, | 10 # There are two copies of this file: one upstream and one downstream, |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 # Change deps? please modify glue_library_deps variable. | 36 # Change deps? please modify glue_library_deps variable. |
| 37 deps = glue_library_deps | 37 deps = glue_library_deps |
| 38 package_name = "com.android.webview.chromium" | 38 package_name = "com.android.webview.chromium" |
| 39 } | 39 } |
| 40 | 40 |
| 41 android_library("glue") { | 41 android_library("glue") { |
| 42 # Change deps? please modify glue_library_deps variable. | 42 # Change deps? please modify glue_library_deps variable. |
| 43 deps = glue_library_deps | 43 deps = glue_library_deps |
| 44 srcjar_deps = [ | 44 srcjar_deps = [ |
| 45 ":glue_resource_rewriter", | 45 ":glue_resource_rewriter", |
| 46 "//android_webview:locale_pak_srcjar", |
| 46 "//base:base_build_config_gen", | 47 "//base:base_build_config_gen", |
| 47 ] | 48 ] |
| 48 | 49 |
| 49 # New versions of BuildConfig.java will be created when creating an apk. | 50 jar_excluded_patterns = [ |
| 50 jar_excluded_patterns = [ "*/BuildConfig.class" ] | 51 # New versions of BuildConfig.java will be created when creating an apk. |
| 52 "*/BuildConfig.class", |
| 53 |
| 54 # Allow downstream targets to specify their own locale pak files. |
| 55 "*/LocalePakFiles.class", |
| 56 ] |
| 51 | 57 |
| 52 # Always build upstream or downstream target with public or internal | 58 # Always build upstream or downstream target with public or internal |
| 53 # framework jar respectively. | 59 # framework jar respectively. |
| 54 if (is_upstream) { | 60 if (is_upstream) { |
| 55 alternative_android_sdk_ijar_dep = ":public_framework_ijar" | 61 alternative_android_sdk_ijar_dep = ":public_framework_ijar" |
| 56 _ijar = webview_public_framework_ijar | 62 _ijar = webview_public_framework_ijar |
| 57 } else { | 63 } else { |
| 58 assert(defined(webview_internal_framework_jar)) | 64 assert(defined(webview_internal_framework_jar)) |
| 59 alternative_android_sdk_ijar_dep = ":framework_ijar" | 65 alternative_android_sdk_ijar_dep = ":framework_ijar" |
| 60 _ijar = webview_framework_ijar | 66 _ijar = webview_framework_ijar |
| (...skipping 18 matching lines...) Expand all Loading... |
| 79 "java/src/com/android/webview/chromium/WebIconDatabaseAdapter.java", | 85 "java/src/com/android/webview/chromium/WebIconDatabaseAdapter.java", |
| 80 "java/src/com/android/webview/chromium/WebMessagePortAdapter.java", | 86 "java/src/com/android/webview/chromium/WebMessagePortAdapter.java", |
| 81 "java/src/com/android/webview/chromium/WebStorageAdapter.java", | 87 "java/src/com/android/webview/chromium/WebStorageAdapter.java", |
| 82 "java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java", | 88 "java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java", |
| 83 "java/src/com/android/webview/chromium/WebViewChromium.java", | 89 "java/src/com/android/webview/chromium/WebViewChromium.java", |
| 84 "java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java", | 90 "java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java", |
| 85 "java/src/com/android/webview/chromium/WebViewDatabaseAdapter.java", | 91 "java/src/com/android/webview/chromium/WebViewDatabaseAdapter.java", |
| 86 "java/src/com/android/webview/chromium/WebViewDelegateFactory.java", | 92 "java/src/com/android/webview/chromium/WebViewDelegateFactory.java", |
| 87 ] | 93 ] |
| 88 } | 94 } |
| OLD | NEW |