diff options
Diffstat (limited to 'chromium/chrome/android/webapk')
7 files changed, 28 insertions, 13 deletions
diff --git a/chromium/chrome/android/webapk/libs/client/BUILD.gn b/chromium/chrome/android/webapk/libs/client/BUILD.gn index 84eac576794..32b6f20d192 100644 --- a/chromium/chrome/android/webapk/libs/client/BUILD.gn +++ b/chromium/chrome/android/webapk/libs/client/BUILD.gn @@ -12,13 +12,12 @@ android_library("client_java") { "src/org/chromium/webapk/lib/client/WebApkIdentityServiceClient.java", "src/org/chromium/webapk/lib/client/WebApkNavigationClient.java", "src/org/chromium/webapk/lib/client/WebApkServiceConnectionManager.java", - "src/org/chromium/webapk/lib/client/WebApkValidator.java", - "src/org/chromium/webapk/lib/client/WebApkVerifySignature.java", ] deps = [ "//base:base_java", "//chrome/android/webapk/libs/common:common_java", "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java", + "//components/webapk/android/libs/common:java", "//third_party/android_deps:androidx_annotation_annotation_java", ] srcjar_deps = [ ":runtime_library_version_java" ] @@ -37,16 +36,17 @@ junit_binary("webapk_client_junit_tests") { sources = [ "junit/src/org/chromium/webapk/lib/client/WebApkIdentityServiceClientTest.java", "junit/src/org/chromium/webapk/lib/client/WebApkServiceConnectionManagerTest.java", - "junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java", - "junit/src/org/chromium/webapk/lib/client/WebApkVerifySignatureTest.java", ] data = [ "//chrome/test/data/webapks/" ] deps = [ ":client_java", + "//base:base_java", "//base:base_junit_test_support", "//chrome/android/webapk/libs/common:common_java", "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java", "//chrome/android/webapk/test:junit_test_support", + "//components/webapk/android/libs/client:junit", + "//components/webapk/android/libs/common:java", "//testing/android/junit:junit_test_support", ] } diff --git a/chromium/chrome/android/webapk/libs/common/BUILD.gn b/chromium/chrome/android/webapk/libs/common/BUILD.gn index 4d4ef0c3e97..029d71c5efe 100644 --- a/chromium/chrome/android/webapk/libs/common/BUILD.gn +++ b/chromium/chrome/android/webapk/libs/common/BUILD.gn @@ -8,9 +8,9 @@ android_library("common_java") { sources = [ "src/org/chromium/webapk/lib/common/WebApkCommonUtils.java", "src/org/chromium/webapk/lib/common/WebApkConstants.java", - "src/org/chromium/webapk/lib/common/WebApkMetaDataKeys.java", "src/org/chromium/webapk/lib/common/WebApkMetaDataUtils.java", ] + deps = [ "//components/webapk/android/libs/common:java" ] srcjar_deps = [ "//chrome/android/webapk/libs/common:identity_service_aidl" ] } diff --git a/chromium/chrome/android/webapk/libs/runtime_library/BUILD.gn b/chromium/chrome/android/webapk/libs/runtime_library/BUILD.gn index 9626d986bc7..eaba3a5adf5 100644 --- a/chromium/chrome/android/webapk/libs/runtime_library/BUILD.gn +++ b/chromium/chrome/android/webapk/libs/runtime_library/BUILD.gn @@ -45,8 +45,9 @@ android_library("runtime_library_for_tests_java") { ] } -proguarded_dist_dex("webapk_runtime_library") { +dist_dex("webapk_runtime_library") { deps = [ ":runtime_library_for_assets_java" ] + proguard_enabled = true proguard_configs = [ "runtime_library.proguard.flags", "//base/android/proguard/chromium_code.flags", diff --git a/chromium/chrome/android/webapk/shell_apk/BUILD.gn b/chromium/chrome/android/webapk/shell_apk/BUILD.gn index 04a3ce9f422..cbe4079714f 100644 --- a/chromium/chrome/android/webapk/shell_apk/BUILD.gn +++ b/chromium/chrome/android/webapk/shell_apk/BUILD.gn @@ -70,6 +70,7 @@ template("webapk_java") { deps += [ "//chrome/android/webapk/libs/common:common_java", "//chrome/android/webapk/libs/common:splash_java", + "//components/webapk/android/libs/common:java", ] } } @@ -314,7 +315,7 @@ webapk_tmpl("new_splash_webapk") { webapk_tmpl("javatests_webapk") { testonly = true config_file = "manifest/bound_manifest_config.json" - manifest_to_upload_dep = ":generate_old_style_manifest_for_upload" + manifest_to_upload_dep = ":generate_new_style_manifest_for_upload" delta_config_file = "manifest/javatest_manifest_config_delta.json" apk_name = "JavatestsWebApk" apk_package_name = "org.chromium.webapk.test" @@ -359,10 +360,13 @@ junit_binary("webapk_shell_apk_junit_tests") { "junit/src/org/chromium/webapk/shell_apk/WebApkUtilsTest.java", ] deps = [ + ":compiled_in_runtime_library_java", + ":webapk_generated_webapk_java", ":webapk_generated_webapk_with_service_java", "//chrome/android/webapk/libs/common:common_java", "//chrome/android/webapk/libs/runtime_library:runtime_library_for_tests_java", "//chrome/android/webapk/test:junit_test_support", + "//components/webapk/android/libs/common:java", ] } @@ -375,9 +379,11 @@ junit_binary("webapk_shell_apk_h2o_junit_tests") { ] deps = [ ":${h2o_junit_manifest_target_name}", + ":h2o_j_unit_webapk_generated_webapk_java", ":h2o_j_unit_webapk_generated_webapk_with_service_java", "//chrome/android/webapk/libs/common:common_java", "//chrome/android/webapk/test:junit_test_support", + "//components/webapk/android/libs/common:java", ] data_deps = [ ":${h2o_junit_manifest_target_name}" ] } diff --git a/chromium/chrome/android/webapk/shell_apk/current_version/current_version.gni b/chromium/chrome/android/webapk/shell_apk/current_version/current_version.gni index 0cad3b880e8..0736e76aa3f 100644 --- a/chromium/chrome/android/webapk/shell_apk/current_version/current_version.gni +++ b/chromium/chrome/android/webapk/shell_apk/current_version/current_version.gni @@ -12,4 +12,4 @@ # //chrome/android/webapk/shell_apk:webapk is changed. This includes # Java files, Android resource files and AndroidManifest.xml. Does not affect # Chrome.apk -current_shell_apk_version = 128 +current_shell_apk_version = 130 diff --git a/chromium/chrome/android/webapk/shell_apk/javatests/canary_lib/BUILD.gn b/chromium/chrome/android/webapk/shell_apk/javatests/canary_lib/BUILD.gn index 204a1eda720..ea445d160b7 100644 --- a/chromium/chrome/android/webapk/shell_apk/javatests/canary_lib/BUILD.gn +++ b/chromium/chrome/android/webapk/shell_apk/javatests/canary_lib/BUILD.gn @@ -5,26 +5,34 @@ import("//build/config/android/rules.gni") android_library("canary_lib_java") { - dex_path = "$target_out_dir/canary.dex" sources = [ "src/org/chromium/webapk/shell_apk/test/canary/Canary.java" ] } +dist_dex("canary_dex") { + output = "$target_out_dir/canary.dex" + deps = [ ":canary_lib_java" ] +} + android_library("canary_lib2_java") { - dex_path = "$target_out_dir/canary2.dex" sources = [ "src/org/chromium/webapk/shell_apk/test/canary/Canary2.java" ] } +dist_dex("canary2_dex") { + output = "$target_out_dir/canary2.dex" + deps = [ ":canary_lib2_java" ] +} + # dex assets added to dex_optimizer_apk in order to test creating ClassLoader # from .dex in remote APK. android_assets("canary_dex_assets") { sources = [ "$target_out_dir/canary.dex" ] disable_compression = true - deps = [ ":canary_lib_java" ] + deps = [ ":canary_dex" ] } android_assets("canary_dex2_assets") { sources = [ "$target_out_dir/canary2.dex" ] disable_compression = true - deps = [ ":canary_lib2_java" ] + deps = [ ":canary2_dex" ] } diff --git a/chromium/chrome/android/webapk/test/BUILD.gn b/chromium/chrome/android/webapk/test/BUILD.gn index 008fba96676..90d04418c4b 100644 --- a/chromium/chrome/android/webapk/test/BUILD.gn +++ b/chromium/chrome/android/webapk/test/BUILD.gn @@ -11,7 +11,7 @@ java_library("junit_test_support") { sources = [ "src/org/chromium/webapk/test/WebApkTestHelper.java" ] deps = [ "//chrome/android/webapk/libs/common:common_java", + "//third_party/android_deps:robolectric_all_java", "//third_party/mockito:mockito_java", - "//third_party/robolectric:robolectric_all_java", ] } |