diff options
Diffstat (limited to 'chromium/chrome/android/webapk')
4 files changed, 13 insertions, 10 deletions
diff --git a/chromium/chrome/android/webapk/libs/runtime_library/BUILD.gn b/chromium/chrome/android/webapk/libs/runtime_library/BUILD.gn index 77fa40f148b..91dc8d74325 100644 --- a/chromium/chrome/android/webapk/libs/runtime_library/BUILD.gn +++ b/chromium/chrome/android/webapk/libs/runtime_library/BUILD.gn @@ -67,5 +67,6 @@ android_library("runtime_library_javatests") { "//base:base_java_test_support", "//chrome/test/android:chrome_java_test_support", "//content/public/test/android:content_java_test_support", + "//third_party/android_support_test_runner:runner_java", ] } diff --git a/chromium/chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_service/BUILD.gn b/chromium/chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_service/BUILD.gn index 93d67178186..e16e1f6791f 100644 --- a/chromium/chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_service/BUILD.gn +++ b/chromium/chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_service/BUILD.gn @@ -6,6 +6,8 @@ import("//build/config/android/rules.gni") # Implements service which uses {@link WebApkServiceImpl} for testing. android_apk("apk_with_webapk_service") { + # Used as an additional_apk in test scripts. + never_incremental = true android_manifest = "AndroidManifest.xml" apk_name = "ApkWithWebApkService" java_files = [ "src/org/chromium/webapk/lib/runtime_library/test/TestWebApkServiceImplWrapper.java" ] diff --git a/chromium/chrome/android/webapk/shell_apk/BUILD.gn b/chromium/chrome/android/webapk/shell_apk/BUILD.gn index fb6fabed503..c400c2d7c4d 100644 --- a/chromium/chrome/android/webapk/shell_apk/BUILD.gn +++ b/chromium/chrome/android/webapk/shell_apk/BUILD.gn @@ -16,6 +16,11 @@ declare_args() { # The Url of the Web Manifest file. webapk_web_manifest_url = "https://www.template.com/manifest.json" + # Murmur2 hash of the homescreen icon. The hash should be of the icon as it is + # available from the web. The icon bytes should not be transformed (e.g. + # decoded / encoded) prior to taking the hash. + webapk_icon_murmur2_hash = "0" + # Attributes from Web Manifest. webapk_start_url = "https://www.template.com/home_page" webapk_name = "Longer Sample WebAPK Name" @@ -25,14 +30,7 @@ declare_args() { webapk_orientation = "portrait" webapk_theme_color = "2147483648L" # HostBrowserLauncher#MANIFEST_COLOR_INVALID_OR_MISSING webapk_background_color = "2147483648L" #HostBrowserLauncher#MANIFEST_COLOR_INVALID_OR_MISSING - - # The URL of the app icon. Empty if the app icon is generated. - webapk_icon_url = "http://www.template.com/icon.png" - - # Murmur2 hash of the homescreen icon. The hash should be of the icon as it is - # available from the web. The icon bytes should not be transformed (e.g. - # decoded / encoded) prior to taking the hash. - webapk_icon_murmur2_hash = "0L" + webapk_icon_urls_and_icon_murmur2_hashes = "http://www.template.com/icon1.png $webapk_icon_murmur2_hash http://www.template.com/icon2.png $webapk_icon_murmur2_hash" # Host part of |webapk_scope_url|. webapk_scope_url_host = "www.template.com" @@ -68,8 +66,7 @@ jinja_template("shell_apk_manifest") { "orientation=$webapk_orientation", "theme_color=$webapk_theme_color", "background_color=$webapk_background_color", - "icon_url=$webapk_icon_url", - "icon_murmur2_hash=$webapk_icon_murmur2_hash", + "icon_urls_and_icon_murmur2_hashes=$webapk_icon_urls_and_icon_murmur2_hashes", "scope_url_host=$webapk_scope_url_host", "scope_url_path=$webapk_scope_url_path", "web_manifest_url=$webapk_web_manifest_url", @@ -132,6 +129,7 @@ android_library("shell_apk_javatests") { "//base:base_java_test_support", "//chrome/android/webapk/libs/common:common_java", "//content/public/test/android:content_java_test_support", + "//third_party/android_support_test_runner:runner_java", ] srcjar_deps = [ "javatests/dex_optimizer:dex_optimizer_service_aidl" ] } diff --git a/chromium/chrome/android/webapk/shell_apk/javatests/dex_optimizer/BUILD.gn b/chromium/chrome/android/webapk/shell_apk/javatests/dex_optimizer/BUILD.gn index 8a7b64232f3..0c867c7ed57 100644 --- a/chromium/chrome/android/webapk/shell_apk/javatests/dex_optimizer/BUILD.gn +++ b/chromium/chrome/android/webapk/shell_apk/javatests/dex_optimizer/BUILD.gn @@ -13,6 +13,8 @@ android_aidl("dex_optimizer_service_aidl") { } android_apk("dex_optimizer_apk") { + # Used as an additional_apk in test scripts. + never_incremental = true android_manifest = "AndroidManifest.xml" apk_name = "DexOptimizer" chromium_code = false |