mirror of
https://github.com/Alex313031/thorium.git
synced 2025-01-09 11:27:32 -03:00
android M110 rebase
This commit is contained in:
Alexander Frick
parent
7fa6df7710
commit
423e48b646
15 changed files with 89 additions and 112 deletions
BIN
logos/NEW/android/Android_Logo.xcf
Normal file
BIN
logos/NEW/android/Android_Logo.xcf
Normal file
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.5 KiB After Width: | Height: | Size: 6.8 KiB |
|
|
@ -1,4 +1,4 @@
|
|||
# Copyright 2022 The Chromium Authors and Alex313031
|
||||
# Copyright 2023 The Chromium Authors and Alex313031
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
|
||||
|
|
@ -46,10 +46,6 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
|
|||
assert(current_toolchain != android_secondary_abi_toolchain)
|
||||
}
|
||||
|
||||
chrome_jni_registration_header =
|
||||
"$root_build_dir/gen/chrome/browser/android/chrome_jni_registration.h"
|
||||
chrome_jni_for_test_registration_header = "$root_build_dir/gen/chrome/browser/android/chrome_jni_for_test_registration.h"
|
||||
|
||||
if (current_toolchain == default_toolchain) {
|
||||
_default_package = "org.chromium.thorium"
|
||||
if (use_stable_package_name_for_trichrome) {
|
||||
|
|
@ -136,6 +132,7 @@ if (current_toolchain == default_toolchain) {
|
|||
|
||||
_use_stable_package_name_for_trichrome =
|
||||
use_stable_package_name_for_trichrome && android_channel == "beta"
|
||||
_use_high_package_name_for_64bit_only_trichrome = is_high_end_android
|
||||
|
||||
jinja_template("trichrome_library_android_manifest") {
|
||||
input = "java/AndroidManifest_trichrome_library.xml"
|
||||
|
|
@ -169,10 +166,18 @@ if (current_toolchain == default_toolchain) {
|
|||
jinja_template("trichrome_library_64_android_manifest") {
|
||||
input = "java/AndroidManifest_trichrome_library.xml"
|
||||
output = trichrome_library_64_android_manifest
|
||||
if (_use_stable_package_name_for_trichrome) {
|
||||
_version_code = trichrome_64_beta_version_code
|
||||
if (_use_high_package_name_for_64bit_only_trichrome) {
|
||||
if (_use_stable_package_name_for_trichrome) {
|
||||
_version_code = trichrome_64_high_beta_version_code
|
||||
} else {
|
||||
_version_code = trichrome_64_high_version_code
|
||||
}
|
||||
} else {
|
||||
_version_code = trichrome_64_version_code
|
||||
if (_use_stable_package_name_for_trichrome) {
|
||||
_version_code = trichrome_64_beta_version_code
|
||||
} else {
|
||||
_version_code = trichrome_64_version_code
|
||||
}
|
||||
}
|
||||
variables = trichrome_jinja_variables + [
|
||||
"trichrome_version=$_version_code",
|
||||
|
|
@ -246,6 +251,7 @@ if (current_toolchain == default_toolchain) {
|
|||
":ui_locale_string_resources",
|
||||
"//chrome/android/webapk/libs/common:splash_resources",
|
||||
"//chrome/app:java_strings_grd",
|
||||
"//chrome/browser/autofill/android:java_resources",
|
||||
"//chrome/browser/download/android:java_resources",
|
||||
"//chrome/browser/feed/android:feed_java_resources",
|
||||
"//chrome/browser/feedback/android:java_resources",
|
||||
|
|
@ -326,6 +332,7 @@ if (current_toolchain == default_toolchain) {
|
|||
java_group("delegate_public_impl_java") {
|
||||
deps = [
|
||||
":app_hooks_java",
|
||||
"//chrome/browser/accessibility/hierarchysnapshotter/android:delegate_public_impl_java",
|
||||
"//chrome/browser/feed/android:hooks_public_impl_java",
|
||||
"//chrome/browser/lens:delegate_public_impl_java",
|
||||
"//chrome/browser/locale:delegate_public_impl_java",
|
||||
|
|
@ -335,9 +342,9 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/policy/android:delegate_public_impl_java",
|
||||
"//chrome/browser/supervised_user:parent_auth_delegate_impl_java",
|
||||
"//chrome/browser/touch_to_fill/android/internal:resource_provider_public_impl_java",
|
||||
"//components/autofill_assistant/android:autofill_assistant_public_impl_java",
|
||||
"//components/externalauth/android:google_delegate_public_impl_java",
|
||||
"//components/language/android:ulp_delegate_public_java",
|
||||
"//components/signin/public/android:account_email_domain_displayability_java",
|
||||
]
|
||||
}
|
||||
|
||||
|
|
@ -380,14 +387,16 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/android/webapk/libs/common:common_java",
|
||||
"//chrome/android/webapk/libs/common:splash_java",
|
||||
"//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",
|
||||
"//chrome/browser/accessibility/hierarchysnapshotter/android:java",
|
||||
"//chrome/browser/android/browserservices/constants:java",
|
||||
"//chrome/browser/android/browserservices/intents:java",
|
||||
"//chrome/browser/android/browserservices/metrics:java",
|
||||
"//chrome/browser/android/browserservices/verification:java",
|
||||
"//chrome/browser/android/crypto:java",
|
||||
"//chrome/browser/android/customtabs/branding:java",
|
||||
"//chrome/browser/android/lifecycle:java",
|
||||
"//chrome/browser/android/messages:java",
|
||||
"//chrome/browser/android/webapps/launchpad:java",
|
||||
"//chrome/browser/autofill/android:java",
|
||||
"//chrome/browser/back_press/android:java",
|
||||
"//chrome/browser/banners/android:java",
|
||||
"//chrome/browser/battery/android:java",
|
||||
|
|
@ -470,7 +479,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/ui/android/favicon:java",
|
||||
"//chrome/browser/ui/android/layouts:java",
|
||||
"//chrome/browser/ui/android/layouts/glue:java",
|
||||
"//chrome/browser/ui/android/layouts/third_party/float_property:java",
|
||||
"//chrome/browser/ui/android/logo:java",
|
||||
"//chrome/browser/ui/android/management:java",
|
||||
"//chrome/browser/ui/android/multiwindow:java",
|
||||
|
|
@ -496,9 +504,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/xsurface:java",
|
||||
"//components/autofill/android:autofill_java",
|
||||
"//components/autofill/android:prefeditor_autofill_java",
|
||||
"//components/autofill_assistant/android:public_dependencies_java",
|
||||
"//components/autofill_assistant/android:public_java",
|
||||
"//components/autofill_assistant/browser:proto_java",
|
||||
"//components/background_task_scheduler:background_task_scheduler_java",
|
||||
"//components/background_task_scheduler:background_task_scheduler_task_ids_java",
|
||||
"//components/bookmarks/common/android:bookmarks_java",
|
||||
|
|
@ -530,6 +535,7 @@ if (current_toolchain == default_toolchain) {
|
|||
"//components/content_capture/android:java",
|
||||
"//components/content_settings/android:content_settings_enums_java",
|
||||
"//components/content_settings/android:java",
|
||||
"//components/crash/android:anr_collector_java",
|
||||
"//components/crash/android:java",
|
||||
"//components/digital_asset_links/android:java",
|
||||
"//components/digital_goods/mojom:mojom_java",
|
||||
|
|
@ -569,6 +575,7 @@ if (current_toolchain == default_toolchain) {
|
|||
"//components/messages/android:factory_java",
|
||||
"//components/messages/android:java",
|
||||
"//components/messages/android:manager_java",
|
||||
"//components/metrics:metrics_java",
|
||||
"//components/minidump_uploader:minidump_uploader_java",
|
||||
"//components/module_installer/android:module_installer_java",
|
||||
"//components/module_installer/android:module_interface_java",
|
||||
|
|
@ -621,7 +628,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"//components/variations:variations_java",
|
||||
"//components/variations/android:variations_java",
|
||||
"//components/version_info/android:version_constants_java",
|
||||
"//components/viz/common:common_java",
|
||||
"//components/viz/service:service_java",
|
||||
"//components/webapk/android/libs/client:java",
|
||||
"//components/webapk/android/libs/common:java",
|
||||
|
|
@ -686,7 +692,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"//third_party/gif_player:gif_player_java",
|
||||
"//third_party/metrics_proto:metrics_proto_java",
|
||||
"//ui/android:ui_java",
|
||||
"//ui/base:features_java",
|
||||
"//ui/base/ime/mojom:mojom_java",
|
||||
"//ui/base/mojom:mojom_java",
|
||||
"//ui/gfx/geometry/mojom:mojom_java",
|
||||
|
|
@ -698,13 +703,11 @@ if (current_toolchain == default_toolchain) {
|
|||
deps += feed_deps
|
||||
|
||||
srcjar_deps = [
|
||||
":autofill_verification_status_generated_enum",
|
||||
":chrome_android_java_enums_srcjar",
|
||||
":chrome_android_java_google_api_keys_srcjar",
|
||||
":chrome_strict_mode_switch",
|
||||
":resource_id_javagen",
|
||||
":vr_build_config",
|
||||
"//chrome:instant_apps_reasons_enum_javagen",
|
||||
"//chrome:offline_pages_enum_javagen",
|
||||
"//chrome:partner_bookmarks_javagen",
|
||||
"//chrome:supervised_user_url_filter_enum_javagen",
|
||||
|
|
@ -713,7 +716,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser:sharing_send_message_result_generated_enum",
|
||||
"//chrome/browser:survey_http_client_type_enum",
|
||||
"//chrome/browser/notifications/scheduler/public:jni_enums",
|
||||
"//chrome/browser/supervised_user/supervised_user_error_page:enums_srcjar",
|
||||
"//chrome/browser/ui:duplicate_download_enums_java",
|
||||
"//components/browsing_data/core:browsing_data_utils_java",
|
||||
"//components/browsing_data/core:clear_browsing_data_tab_java",
|
||||
|
|
@ -788,7 +790,7 @@ if (current_toolchain == default_toolchain) {
|
|||
sources += commerce_subscriptions_java_sources
|
||||
deps += commerce_subscriptions_java_deps
|
||||
|
||||
if (enable_basic_printing) {
|
||||
if (enable_printing) {
|
||||
deps += [ "//printing:printing_java" ]
|
||||
}
|
||||
|
||||
|
|
@ -854,10 +856,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"//components/segmentation_platform/internal:internal_java",
|
||||
]
|
||||
|
||||
if (disable_autofill_assistant_dfm) {
|
||||
deps += [ "//components/autofill_assistant/android:java" ]
|
||||
}
|
||||
|
||||
if (disable_tab_ui_dfm) {
|
||||
deps += [
|
||||
"//chrome/android/features/tab_ui:java",
|
||||
|
|
@ -875,10 +873,6 @@ if (current_toolchain == default_toolchain) {
|
|||
]
|
||||
}
|
||||
|
||||
java_cpp_enum("autofill_verification_status_generated_enum") {
|
||||
sources = [ "//components/autofill/core/browser/data_model/autofill_structured_address_component.h" ]
|
||||
}
|
||||
|
||||
java_cpp_enum("chrome_android_java_enums_srcjar") {
|
||||
sources = [
|
||||
"//chrome/browser/android/customtabs/detached_resource_request.h",
|
||||
|
|
@ -934,6 +928,9 @@ if (current_toolchain == default_toolchain) {
|
|||
# Needed by androidx.test.core.app.ActivityScenario
|
||||
android_manifest = "//chrome/android/junit/AndroidManifest.xml"
|
||||
|
||||
# This target OOMs with the default 1G (also OOMS with 2G).
|
||||
max_heap_size = "4G"
|
||||
|
||||
data_deps = [ "//testing/buildbot/filters:chrome_junit_tests_filters" ]
|
||||
|
||||
package_name = chrome_public_manifest_package
|
||||
|
|
@ -941,6 +938,8 @@ if (current_toolchain == default_toolchain) {
|
|||
# From java_sources.gni.
|
||||
sources = chrome_junit_test_java_sources
|
||||
|
||||
shared_libraries = [ "//url:libgurl_robolectric($robolectric_toolchain)" ]
|
||||
|
||||
# Should not have any deps native targets since junit tests are java-only.
|
||||
assert_no_deps = [
|
||||
"//content",
|
||||
|
|
@ -985,9 +984,10 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/android/browserservices/verification:java",
|
||||
"//chrome/browser/android/browserservices/verification:junit_test_support",
|
||||
"//chrome/browser/android/crypto:java",
|
||||
"//chrome/browser/android/customtabs/branding:junit",
|
||||
"//chrome/browser/android/httpclient:junit_tests",
|
||||
"//chrome/browser/android/lifecycle:java",
|
||||
"//chrome/browser/android/webapps/launchpad:junit_tests",
|
||||
"//chrome/browser/autofill/android:java",
|
||||
"//chrome/browser/back_press/android:java",
|
||||
"//chrome/browser/back_press/android:junit",
|
||||
"//chrome/browser/banners/android:java",
|
||||
|
|
@ -1067,6 +1067,7 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/tabmodel/internal:java",
|
||||
"//chrome/browser/tabpersistence:junit",
|
||||
"//chrome/browser/thumbnail:java",
|
||||
"//chrome/browser/touch_to_fill/payments/android/internal:junit",
|
||||
"//chrome/browser/ui/android/appmenu:java",
|
||||
"//chrome/browser/ui/android/appmenu/internal:junit",
|
||||
"//chrome/browser/ui/android/autofill/internal:junit",
|
||||
|
|
@ -1283,7 +1284,7 @@ if (current_toolchain == default_toolchain) {
|
|||
]
|
||||
}
|
||||
|
||||
# Files used for both chrome tests and VR/AR and autofill_assistant tests
|
||||
# Files used for both chrome tests and VR/AR tests
|
||||
android_library("chrome_test_util_java") {
|
||||
testonly = true
|
||||
|
||||
|
|
@ -1392,7 +1393,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"//base:base_java_test_support",
|
||||
"//chrome/android:base_module_java",
|
||||
"//chrome/android:chrome_java",
|
||||
"//chrome/android/features/autofill_assistant:unit_test_java",
|
||||
"//chrome/browser/android/browserservices/intents:java",
|
||||
"//chrome/browser/android/browserservices/verification:java",
|
||||
"//chrome/browser/android/crypto:java",
|
||||
|
|
@ -1419,7 +1419,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/test/android:chrome_java_integration_test_support",
|
||||
"//chrome/test/android:chrome_java_unit_test_support",
|
||||
"//components/autofill/android:main_autofill_java",
|
||||
"//components/autofill_assistant/android:public_java",
|
||||
"//components/background_task_scheduler:background_task_scheduler_task_ids_java",
|
||||
"//components/bookmarks/common/android:bookmarks_java",
|
||||
"//components/browser_ui/modaldialog/android:java",
|
||||
|
|
@ -1471,9 +1470,9 @@ if (current_toolchain == default_toolchain) {
|
|||
"//ui/android:ui_full_java",
|
||||
"//ui/android:ui_java_test_support",
|
||||
"//url:gurl_java",
|
||||
"//url:gurl_java_unit_tests",
|
||||
"//url:gurl_junit_test_support",
|
||||
"//url:origin_java",
|
||||
"//url:url_java_unit_tests",
|
||||
]
|
||||
|
||||
sources += share_unit_device_javatest_java_sources
|
||||
|
|
@ -1507,6 +1506,7 @@ if (current_toolchain == default_toolchain) {
|
|||
"//base/test:test_support_java",
|
||||
"//cc:cc_java",
|
||||
"//chrome/android:chrome_java",
|
||||
"//chrome/android/features/keyboard_accessory/public:public_java",
|
||||
"//chrome/android/features/start_surface:java_resources",
|
||||
"//chrome/android/features/start_surface:public_java",
|
||||
"//chrome/android/features/tab_ui:java",
|
||||
|
|
@ -1521,11 +1521,13 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/android/browserservices/verification:java",
|
||||
"//chrome/browser/android/browserservices/verification:javatests",
|
||||
"//chrome/browser/android/crypto:java",
|
||||
"//chrome/browser/android/customtabs/branding:java",
|
||||
"//chrome/browser/android/httpclient:javatests",
|
||||
"//chrome/browser/android/lifecycle:java",
|
||||
"//chrome/browser/android/metrics:ukm_java_test_support",
|
||||
"//chrome/browser/android/metrics:ukm_javatests",
|
||||
"//chrome/browser/android/webapps/launchpad:java",
|
||||
"//chrome/browser/autofill/android:java_resources",
|
||||
"//chrome/browser/autofill/test:test_support_java",
|
||||
"//chrome/browser/back_press/android:java",
|
||||
"//chrome/browser/banners/android:java",
|
||||
"//chrome/browser/browser_controls/android:java",
|
||||
|
|
@ -1616,7 +1618,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/ui/android/favicon:java",
|
||||
"//chrome/browser/ui/android/layouts:java",
|
||||
"//chrome/browser/ui/android/layouts/test:java",
|
||||
"//chrome/browser/ui/android/layouts/third_party/float_property:java",
|
||||
"//chrome/browser/ui/android/logo:java",
|
||||
"//chrome/browser/ui/android/multiwindow:javatests",
|
||||
"//chrome/browser/ui/android/native_page:java",
|
||||
|
|
@ -1643,8 +1644,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/test/android/test_trusted_web_activity:test_trusted_web_activity_java",
|
||||
"//components/autofill/android:autofill_java",
|
||||
"//components/autofill/android:prefeditor_autofill_java",
|
||||
"//components/autofill_assistant/android:public_dependencies_java",
|
||||
"//components/autofill_assistant/android:public_java",
|
||||
"//components/background_task_scheduler:background_task_scheduler_java",
|
||||
"//components/background_task_scheduler:background_task_scheduler_task_ids_java",
|
||||
"//components/bookmarks/common/android:bookmarks_java",
|
||||
|
|
@ -1751,7 +1750,9 @@ if (current_toolchain == default_toolchain) {
|
|||
"//components/url_formatter/android:url_formatter_java",
|
||||
"//components/user_prefs/android:java",
|
||||
"//components/version_info/android:version_constants_java",
|
||||
"//components/webapk:proto_java",
|
||||
"//components/webapk/android/libs/client:java",
|
||||
"//components/webapk/android/libs/common:java",
|
||||
"//components/webapps/browser/android:java",
|
||||
"//components/webauthn/android:java",
|
||||
"//components/webauthn/android:test_support_java",
|
||||
|
|
@ -1775,7 +1776,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"//services/network/public/mojom:url_loader_base_java",
|
||||
"//services/service_manager/public/java:service_manager_java",
|
||||
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
|
||||
"//third_party/android_deps:com_google_flatbuffers_flatbuffers_java_java",
|
||||
"//third_party/android_deps:espresso_java",
|
||||
"//third_party/android_deps:material_design_java",
|
||||
"//third_party/android_deps:protobuf_lite_runtime_java",
|
||||
|
|
@ -1799,6 +1799,7 @@ if (current_toolchain == default_toolchain) {
|
|||
"//third_party/blink/public/mojom:mojom_core_java",
|
||||
"//third_party/blink/public/mojom:mojom_mhtml_load_result_java",
|
||||
"//third_party/blink/public/mojom:mojom_platform_java",
|
||||
"//third_party/flatbuffers:flatbuffers_java",
|
||||
"//third_party/hamcrest:hamcrest_java",
|
||||
"//third_party/junit",
|
||||
"//third_party/metrics_proto:metrics_proto_java",
|
||||
|
|
@ -1819,7 +1820,7 @@ if (current_toolchain == default_toolchain) {
|
|||
|
||||
deps += commerce_subscriptions_java_test_deps
|
||||
|
||||
if (enable_basic_printing) {
|
||||
if (enable_printing) {
|
||||
deps += [ "//printing:printing_java" ]
|
||||
}
|
||||
|
||||
|
|
@ -1845,6 +1846,7 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/test/data/portal/",
|
||||
"//chrome/test/data/push_messaging/",
|
||||
"//chrome/test/data/translate/",
|
||||
"//chrome/test/data/webauthn/",
|
||||
"//chrome/test/media_router/resources/",
|
||||
"//components/test/data/autofill/",
|
||||
"//components/test/data/payments/",
|
||||
|
|
@ -2124,7 +2126,7 @@ if (current_toolchain == default_toolchain) {
|
|||
|
||||
generate_jni_registration("chrome_jni_registration") {
|
||||
targets = [ ":chrome_public_base_module_java" ]
|
||||
header_output = chrome_jni_registration_header
|
||||
manual_jni_registration = true
|
||||
sources_exclusions = chrome_jni_sources_exclusions
|
||||
}
|
||||
|
||||
|
|
@ -2133,7 +2135,7 @@ if (current_toolchain == default_toolchain) {
|
|||
generate_jni_registration("chrome_jni_for_test_registration") {
|
||||
testonly = true
|
||||
targets = [ ":chrome_public_base_module_java_for_test" ]
|
||||
header_output = chrome_jni_for_test_registration_header
|
||||
manual_jni_registration = true
|
||||
sources_exclusions = chrome_jni_sources_exclusions
|
||||
}
|
||||
|
||||
|
|
@ -2362,7 +2364,6 @@ if (current_toolchain == default_toolchain) {
|
|||
deps = [
|
||||
":browser_java_test_support",
|
||||
":chrome_test_util_java",
|
||||
"//chrome/android/features/autofill_assistant:autofill_assistant_java_test_support",
|
||||
"//chrome/browser/android/metrics:ukm_java_test_support",
|
||||
"//chrome/browser/password_manager/android:test_support_java",
|
||||
"//chrome/browser/subresource_filter:subresource_filter_java_test_support",
|
||||
|
|
@ -2371,6 +2372,7 @@ if (current_toolchain == default_toolchain) {
|
|||
"//components/external_intents/android:test_support_java",
|
||||
"//components/minidump_uploader:minidump_uploader_java",
|
||||
"//components/paint_preview/player/android:player_java_test_support",
|
||||
"//components/variations/android:test_support_java",
|
||||
"//content/public/test/android:content_java_test_support",
|
||||
"//ui/android:clipboard_java_test_support",
|
||||
]
|
||||
|
|
@ -2438,8 +2440,9 @@ if (current_toolchain == default_toolchain) {
|
|||
"//third_party/android_deps:protobuf_lite_runtime_java",
|
||||
"//third_party/androidx:androidx_annotation_annotation_java",
|
||||
"//third_party/junit",
|
||||
"//url:gurl_android_test_helper_java",
|
||||
"//url:android_test_helper_java",
|
||||
"//url:gurl_java",
|
||||
"//url:origin_java",
|
||||
]
|
||||
|
||||
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
|
||||
|
|
@ -2467,8 +2470,8 @@ if (current_toolchain == default_toolchain) {
|
|||
"//components/sync:test_support",
|
||||
"//content/test:test_support",
|
||||
"//net:test_support",
|
||||
"//url:android_test_helper",
|
||||
"//url:gurl_android",
|
||||
"//url:gurl_android_test_helper",
|
||||
]
|
||||
}
|
||||
|
||||
|
|
@ -2494,13 +2497,13 @@ if (current_toolchain == default_toolchain) {
|
|||
"apk_name",
|
||||
"bundle_target",
|
||||
"is_base_module",
|
||||
"jni_registration_header",
|
||||
"target_type",
|
||||
"enable_lint",
|
||||
"enable_multidex",
|
||||
"lint_baseline_file",
|
||||
"lint_suppressions_dep",
|
||||
"lint_suppressions_file",
|
||||
"manual_jni_registration",
|
||||
])
|
||||
deps = _chrome_public_shared_deps
|
||||
|
||||
|
|
@ -2515,13 +2518,6 @@ if (current_toolchain == default_toolchain) {
|
|||
|
||||
shared_libraries = [ ":libchrome" ]
|
||||
|
||||
# Native libraries can be loaded directly from the APK using the
|
||||
# Chromium linker. However, we disable this for J-K due to an OEM-specific
|
||||
# platform bug, where overzealous SELinux settings prevent mapping some apk
|
||||
# file segments with PROT_EXEC (see http://crbug.com/398425). This was
|
||||
# fixed for Android L by adding proper CTS tests.
|
||||
load_library_from_apk = chromium_linker_supported
|
||||
|
||||
version_name = chrome_version_name
|
||||
}
|
||||
}
|
||||
|
|
@ -2613,7 +2609,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"java/src/org/chromium/chrome/browser/metrics/UmaUtils.java",
|
||||
"java/src/org/chromium/chrome/browser/notifications/NotificationJobService.java",
|
||||
"java/src/org/chromium/chrome/browser/notifications/NotificationService.java",
|
||||
"java/src/org/chromium/chrome/browser/omaha/OmahaClient.java",
|
||||
"java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java",
|
||||
"java/src/org/chromium/chrome/browser/prerender/ChromePrerenderService.java",
|
||||
"java/src/org/chromium/chrome/browser/provider/ChromeBrowserProvider.java",
|
||||
|
|
@ -2648,7 +2643,6 @@ if (current_toolchain == default_toolchain) {
|
|||
|
||||
# Deps needed for child processes.
|
||||
"//components/version_info/android:version_constants_java",
|
||||
"//components/viz/common:common_java",
|
||||
"//components/viz/service:service_java",
|
||||
"//content/public/android:content_main_dex_java",
|
||||
"//media/base/android:media_java",
|
||||
|
|
@ -2732,10 +2726,18 @@ if (current_toolchain == default_toolchain) {
|
|||
_version_code = trichrome_64_32_version_code
|
||||
}
|
||||
} else {
|
||||
if (_use_stable_package_name_for_trichrome) {
|
||||
_version_code = trichrome_64_beta_version_code
|
||||
if (_use_high_package_name_for_64bit_only_trichrome) {
|
||||
if (_use_stable_package_name_for_trichrome) {
|
||||
_version_code = trichrome_64_high_beta_version_code
|
||||
} else {
|
||||
_version_code = trichrome_64_high_version_code
|
||||
}
|
||||
} else {
|
||||
_version_code = trichrome_64_version_code
|
||||
if (_use_stable_package_name_for_trichrome) {
|
||||
_version_code = trichrome_64_beta_version_code
|
||||
} else {
|
||||
_version_code = trichrome_64_version_code
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
|
@ -2795,10 +2797,8 @@ if (current_toolchain == default_toolchain) {
|
|||
"is_base_module",
|
||||
"resource_ids_provider_dep",
|
||||
"static_library_provider",
|
||||
"static_library_synchronized_proguard",
|
||||
"target_type",
|
||||
"use_chromium_linker",
|
||||
"use_modern_linker",
|
||||
"use_trichrome_library",
|
||||
"version_code",
|
||||
"version_name",
|
||||
|
|
@ -2875,11 +2875,6 @@ if (current_toolchain == default_toolchain) {
|
|||
include_64_bit_webview = true
|
||||
}
|
||||
|
||||
if (trichrome_synchronized_proguard) {
|
||||
webview_target = "//android_webview:trichrome_webview_apk"
|
||||
chrome_target = ":trichrome_chrome_bundle"
|
||||
}
|
||||
|
||||
if (_enable_manifest_verification) {
|
||||
expected_android_manifest =
|
||||
"expectations/trichrome_library_apk.AndroidManifest.expected"
|
||||
|
|
@ -2891,8 +2886,12 @@ if (current_toolchain == default_toolchain) {
|
|||
|
||||
# Can be used to install compressed apks on system images.
|
||||
system_image_stub_apk("trichrome_library_system_stub_apk") {
|
||||
package_name = chrome_public_manifest_package
|
||||
package_name = trichrome_library_package
|
||||
version_code = trichrome_version_code
|
||||
version_name = chrome_version_name
|
||||
stub_output = "$root_out_dir/apks/TrichromeLibrary-Stub.apk"
|
||||
static_library_name = trichrome_library_package
|
||||
static_library_version = trichrome_version_code
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -3160,7 +3159,9 @@ if (current_toolchain == default_toolchain) {
|
|||
"//components/payments/content/android:unit_device_javatests",
|
||||
"//components/signin/public/android:unit_device_javatests",
|
||||
"//components/strictmode/android:unit_device_javatests",
|
||||
"//components/translate/content/android:unit_device_javatests",
|
||||
"//components/url_formatter/android:unit_device_javatests",
|
||||
"//components/variations/android:unit_device_javatests",
|
||||
"//ui/android:ui_unit_device_javatests",
|
||||
]
|
||||
|
||||
|
|
@ -3188,8 +3189,8 @@ if (current_toolchain == default_toolchain) {
|
|||
deps = [
|
||||
":chrome_test_apk_template_resources",
|
||||
":chrome_test_java",
|
||||
"//chrome/android/features/autofill_assistant:test_java",
|
||||
"//chrome/android/features/keyboard_accessory:test_java",
|
||||
"//chrome/browser/autofill/test:test_java",
|
||||
"//chrome/browser/banners/android:javatests",
|
||||
"//chrome/browser/download/internal/android:javatests",
|
||||
"//chrome/browser/engagement/android:javatests",
|
||||
|
|
@ -3197,6 +3198,7 @@ if (current_toolchain == default_toolchain) {
|
|||
"//chrome/browser/password_check/android:test_java",
|
||||
"//chrome/browser/subresource_filter:subresource_filter_javatests",
|
||||
"//chrome/browser/touch_to_fill/android:test_java",
|
||||
"//chrome/browser/touch_to_fill/payments/android/internal:javatests",
|
||||
"//chrome/browser/ui/android/fast_checkout/internal:javatests",
|
||||
"//chrome/browser/ui/android/omnibox:javatests",
|
||||
"//chrome/browser/ui/android/webid/internal:javatests",
|
||||
|
|
@ -3521,7 +3523,7 @@ if (current_toolchain == default_toolchain) {
|
|||
]
|
||||
data_deps = [
|
||||
":chrome_public_apk",
|
||||
"//chrome/test/chromedriver:chromedriver($host_toolchain)",
|
||||
"//chrome/test/chromedriver:chromedriver_server($host_toolchain)",
|
||||
"//third_party/blink/tools:wpt_tests_android_isolate",
|
||||
]
|
||||
}
|
||||
|
|
@ -3576,10 +3578,18 @@ if (current_toolchain == default_toolchain) {
|
|||
_version_code = trichrome_64_32_version_code
|
||||
}
|
||||
} else {
|
||||
if (_use_stable_package_name_for_trichrome) {
|
||||
_version_code = trichrome_64_beta_version_code
|
||||
if (_use_high_package_name_for_64bit_only_trichrome) {
|
||||
if (_use_stable_package_name_for_trichrome) {
|
||||
_version_code = trichrome_64_high_beta_version_code
|
||||
} else {
|
||||
_version_code = trichrome_64_high_version_code
|
||||
}
|
||||
} else {
|
||||
_version_code = trichrome_64_version_code
|
||||
if (_use_stable_package_name_for_trichrome) {
|
||||
_version_code = trichrome_64_beta_version_code
|
||||
} else {
|
||||
_version_code = trichrome_64_version_code
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
|
@ -3643,13 +3653,13 @@ if (current_toolchain == default_toolchain) {
|
|||
"include_32_bit_webview",
|
||||
"include_64_bit_webview",
|
||||
"static_library_provider",
|
||||
"static_library_synchronized_proguard",
|
||||
"resource_ids_provider_dep",
|
||||
"use_trichrome_library",
|
||||
])
|
||||
target_type = "android_app_bundle_module"
|
||||
is_base_module = true
|
||||
version_code = _version_code
|
||||
bundle_target = ":${invoker.target_name}"
|
||||
|
||||
if (defined(invoker.expected_android_manifest_template)) {
|
||||
expected_android_manifest =
|
||||
|
|
@ -3657,12 +3667,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"SPLIT_NAME",
|
||||
"base")
|
||||
}
|
||||
|
||||
if (!_is_trichrome ||
|
||||
!defined(invoker.static_library_synchronized_proguard) ||
|
||||
!invoker.static_library_synchronized_proguard) {
|
||||
bundle_target = ":${invoker.target_name}"
|
||||
}
|
||||
}
|
||||
|
||||
chrome_bundle(target_name) {
|
||||
|
|
@ -3677,7 +3681,6 @@ if (current_toolchain == default_toolchain) {
|
|||
"lint_min_sdk_version",
|
||||
"lint_suppressions_file",
|
||||
"static_library_provider",
|
||||
"static_library_synchronized_proguard",
|
||||
"expected_android_manifest_template",
|
||||
"expected_libs_and_assets",
|
||||
"expected_proguard_config",
|
||||
|
|
@ -3766,12 +3769,6 @@ if (current_toolchain == default_toolchain) {
|
|||
use_trichrome_library = true
|
||||
static_library_provider = ":trichrome_library_apk"
|
||||
add_view_trace_events = true
|
||||
if (!is_java_debug) {
|
||||
static_library_synchronized_proguard = trichrome_synchronized_proguard
|
||||
if (trichrome_synchronized_proguard) {
|
||||
resource_ids_provider_dep = "//android_webview:trichrome_webview_apk"
|
||||
}
|
||||
}
|
||||
if (android_64bit_target_cpu) {
|
||||
is_64_bit_browser = false
|
||||
include_64_bit_webview = true
|
||||
|
|
@ -3927,7 +3924,6 @@ generate_jni("chrome_jni_headers") {
|
|||
"java/src/org/chromium/chrome/browser/ApplicationLifetime.java",
|
||||
"java/src/org/chromium/chrome/browser/ChromeBackupAgentImpl.java",
|
||||
"java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java",
|
||||
"java/src/org/chromium/chrome/browser/ChromePowerModeVoter.java",
|
||||
"java/src/org/chromium/chrome/browser/DevToolsServer.java",
|
||||
"java/src/org/chromium/chrome/browser/IntentHandler.java",
|
||||
"java/src/org/chromium/chrome/browser/NearOomMonitor.java",
|
||||
|
|
@ -3941,15 +3937,14 @@ generate_jni("chrome_jni_headers") {
|
|||
"java/src/org/chromium/chrome/browser/app/send_tab_to_self/SendTabToSelfNotificationReceiver.java",
|
||||
"java/src/org/chromium/chrome/browser/app/tab_activity_glue/ReparentingTask.java",
|
||||
"java/src/org/chromium/chrome/browser/app/video_tutorials/VideoTutorialsServiceUtils.java",
|
||||
"java/src/org/chromium/chrome/browser/autofill/AutofillAccessibilityUtils.java",
|
||||
"java/src/org/chromium/chrome/browser/autofill/AutofillExpirationDateFixFlowBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/autofill/AutofillLogger.java",
|
||||
"java/src/org/chromium/chrome/browser/autofill/AutofillMessageConfirmFlowBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/autofill/AutofillNameFixFlowBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/autofill/AutofillPopupBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/autofill/AutofillSnackbarController.java",
|
||||
"java/src/org/chromium/chrome/browser/autofill/CardUnmaskBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/autofill/CreditCardScannerBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java",
|
||||
"java/src/org/chromium/chrome/browser/autofill/PhoneNumberUtil.java",
|
||||
"java/src/org/chromium/chrome/browser/autofill/SaveUpdateAddressProfilePrompt.java",
|
||||
"java/src/org/chromium/chrome/browser/autofill/SaveUpdateAddressProfilePromptController.java",
|
||||
|
|
@ -3995,7 +3990,6 @@ generate_jni("chrome_jni_headers") {
|
|||
"java/src/org/chromium/chrome/browser/device_dialog/ChromeBluetoothChooserAndroidDelegate.java",
|
||||
"java/src/org/chromium/chrome/browser/device_dialog/ChromeBluetoothScanningPromptAndroidDelegate.java",
|
||||
"java/src/org/chromium/chrome/browser/device_dialog/UsbChooserDialog.java",
|
||||
"java/src/org/chromium/chrome/browser/document/DocumentWebContentsDelegate.java",
|
||||
"java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerServiceFactory.java",
|
||||
"java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerTabUtils.java",
|
||||
"java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerUIUtils.java",
|
||||
|
|
@ -4027,23 +4021,16 @@ generate_jni("chrome_jni_headers") {
|
|||
"java/src/org/chromium/chrome/browser/infobar/AutofillVirtualCardEnrollmentInfoBar.java",
|
||||
"java/src/org/chromium/chrome/browser/infobar/DuplicateDownloadInfoBar.java",
|
||||
"java/src/org/chromium/chrome/browser/infobar/FramebustBlockInfoBar.java",
|
||||
"java/src/org/chromium/chrome/browser/infobar/GeneratedPasswordSavedInfoBarDelegate.java",
|
||||
"java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java",
|
||||
"java/src/org/chromium/chrome/browser/infobar/InstantAppsInfoBar.java",
|
||||
"java/src/org/chromium/chrome/browser/infobar/InstantAppsInfoBarDelegate.java",
|
||||
"java/src/org/chromium/chrome/browser/infobar/KnownInterceptionDisclosureInfoBar.java",
|
||||
"java/src/org/chromium/chrome/browser/infobar/NearOomInfoBar.java",
|
||||
"java/src/org/chromium/chrome/browser/infobar/NearOomReductionInfoBar.java",
|
||||
"java/src/org/chromium/chrome/browser/infobar/PermissionInfoBar.java",
|
||||
"java/src/org/chromium/chrome/browser/infobar/ReaderModeInfoBar.java",
|
||||
"java/src/org/chromium/chrome/browser/infobar/SafetyTipInfoBar.java",
|
||||
"java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java",
|
||||
"java/src/org/chromium/chrome/browser/infobar/SurveyInfoBar.java",
|
||||
"java/src/org/chromium/chrome/browser/infobar/TranslateCompactInfoBar.java",
|
||||
"java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java",
|
||||
"java/src/org/chromium/chrome/browser/init/NativeStartupBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/instantapps/InstantAppsMessageDelegate.java",
|
||||
"java/src/org/chromium/chrome/browser/instantapps/InstantAppsSettings.java",
|
||||
"java/src/org/chromium/chrome/browser/javascript/WebContextFetcher.java",
|
||||
"java/src/org/chromium/chrome/browser/lens/LensDebugBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/lens/LensPolicyUtils.java",
|
||||
|
|
@ -4062,6 +4049,7 @@ generate_jni("chrome_jni_headers") {
|
|||
"java/src/org/chromium/chrome/browser/notifications/ActionInfo.java",
|
||||
"java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/notifications/NotificationTriggerScheduler.java",
|
||||
"java/src/org/chromium/chrome/browser/notifications/PushMessagingServiceBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/notifications/scheduler/DisplayAgent.java",
|
||||
"java/src/org/chromium/chrome/browser/notifications/scheduler/NotificationSchedulerTask.java",
|
||||
"java/src/org/chromium/chrome/browser/ntp/ForeignSessionHelper.java",
|
||||
|
|
@ -4084,7 +4072,6 @@ generate_jni("chrome_jni_headers") {
|
|||
"java/src/org/chromium/chrome/browser/password_manager/AutoSigninSnackbarController.java",
|
||||
"java/src/org/chromium/chrome/browser/password_manager/Credential.java",
|
||||
"java/src/org/chromium/chrome/browser/password_manager/CredentialLeakDialogBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/password_manager/PasswordChangeLauncher.java",
|
||||
"java/src/org/chromium/chrome/browser/password_manager/PasswordCheckupLauncher.java",
|
||||
"java/src/org/chromium/chrome/browser/password_manager/PasswordGenerationDialogBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/password_manager/PasswordGenerationPopupBridge.java",
|
||||
|
|
@ -4178,7 +4165,6 @@ source_set("chrome_test_util_jni") {
|
|||
group("jni_headers") {
|
||||
public_deps = [
|
||||
":chrome_jni_headers",
|
||||
"//chrome/android/features/autofill_assistant:jni_headers_public",
|
||||
"//chrome/android/features/keyboard_accessory:jni_headers",
|
||||
"//chrome/android/features/start_surface:jni_headers",
|
||||
"//chrome/browser/android/browserservices/metrics:jni_headers",
|
||||
|
|
@ -4213,9 +4199,6 @@ group("jni_headers") {
|
|||
"//chrome/browser/ui/messages/android:jni_headers",
|
||||
"//chrome/browser/util:jni_headers",
|
||||
"//chrome/browser/webauthn/android:jni_headers",
|
||||
"//components/autofill_assistant/android:jni_headers",
|
||||
"//components/autofill_assistant/android:jni_headers_public",
|
||||
"//components/autofill_assistant/android:jni_headers_public_dependencies",
|
||||
"//components/digital_asset_links/android:jni_headers",
|
||||
"//components/image_fetcher:jni_headers",
|
||||
"//components/media_router/browser/android:jni_headers",
|
||||
|
|
@ -4227,10 +4210,7 @@ group("jni_headers") {
|
|||
# Chrome APK's native library.
|
||||
template("libchrome_impl") {
|
||||
chrome_common_shared_library(target_name) {
|
||||
sources = [
|
||||
"../browser/android/chrome_entry_point.cc",
|
||||
chrome_jni_registration_header,
|
||||
]
|
||||
sources = [ "../browser/android/chrome_entry_point.cc" ]
|
||||
deps = [ ":chrome_jni_registration($default_toolchain)" ]
|
||||
if (defined(invoker.deps)) {
|
||||
deps += invoker.deps
|
||||
|
|
@ -4265,10 +4245,7 @@ chrome_common_shared_library("libchromefortest") {
|
|||
testonly = true
|
||||
define_unwind_table_target =
|
||||
add_unwind_tables_in_chrome_32bit_apk && target_cpu == "arm"
|
||||
sources = [
|
||||
"../browser/android/chrome_entry_point_for_test.cc",
|
||||
chrome_jni_for_test_registration_header,
|
||||
]
|
||||
sources = [ "../browser/android/chrome_entry_point_for_test.cc" ]
|
||||
deps = [
|
||||
":browser_test_support",
|
||||
":chrome_jni_for_test_registration($default_toolchain)",
|
||||
|
|
@ -4279,12 +4256,12 @@ chrome_common_shared_library("libchromefortest") {
|
|||
"//chrome/browser/password_manager/android:test_support",
|
||||
"//chrome/browser/subresource_filter:android_test_support",
|
||||
"//chrome/browser/supervised_user:test_support",
|
||||
"//components/autofill_assistant/browser:android_test_support",
|
||||
"//components/crash/android:crash_android",
|
||||
"//components/external_intents/android:test_support",
|
||||
"//components/minidump_uploader",
|
||||
"//components/paint_preview/player/android:test_support",
|
||||
"//components/sync",
|
||||
"//components/variations/android:test_support",
|
||||
"//content/public/test/android:content_native_test_support",
|
||||
"//content/test:test_support",
|
||||
"//ui/base/clipboard:clipboard_test_support",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright 2022 The Chromium Authors. All rights reserved.
|
||||
<!-- Copyright 2023 The Chromium Authors and Alex313031. All rights reserved.
|
||||
Use of this source code is governed by a BSD-style license that can be
|
||||
found in the LICENSE file. -->
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.5 KiB After Width: | Height: | Size: 6.8 KiB |
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright 2015 The Chromium Authors. All rights reserved.
|
||||
<!-- Copyright 2023 The Chromium Authors and Alex313031. All rights reserved.
|
||||
Use of this source code is governed by a BSD-style license that can be
|
||||
found in the LICENSE file. -->
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 6b0272642a03dd075555489cde3de7234e1deea3
|
||||
Subproject commit e28fcb0edf41ced6ba2ffa810cad4c8dddc57495
|
||||
Loading…
Reference in a new issue