Commit 7c041c3b authored by Vasiliy Telezhnikov's avatar Vasiliy Telezhnikov Committed by Commit Bot

[Refactoring] Migrate resource_dirs => sources

This CL converts resource_dirs to sources for android_resources in
chrome/android/BUILD.gn file.

Details:
https://crbug.com/1026378
https://groups.google.com/a/chromium.org/forum/#!msg/chromium-dev/KAFsfaoq7y4/OC4v5sb9BQAJ

Bug: 1062263
Change-Id: I9b7b437163ac4d9529de9a18799279a8b1ee9e53
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2109975
Commit-Queue: Vasiliy Telezhnikov <vasilyt@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751826}
parent 38288f76
......@@ -10,6 +10,7 @@ import("//build/config/python.gni")
import("//build/util/process_version.gni")
import("//build/util/version.gni")
import("//chrome/android/chrome_common_shared_library.gni")
import("//chrome/android/chrome_java_resources.gni")
import("//chrome/android/chrome_public_apk_tmpl.gni")
import("//chrome/android/features/dev_ui/dev_ui_module.gni")
import("//chrome/android/features/tab_ui/buildflags.gni")
......@@ -135,9 +136,34 @@ generate_ui_locale_resources("ui_locale_string_resources") {
}
android_resources("chrome_app_java_resources") {
resource_dirs = [
"java/res",
"//chrome/android/java/res_chromium",
sources = chrome_java_resources
sources += [
"//chrome/android/java/res_chromium/drawable-hdpi/fre_product_logo.png",
"//chrome/android/java/res_chromium/drawable-hdpi/product_logo_name.png",
"//chrome/android/java/res_chromium/drawable-mdpi/fre_product_logo.png",
"//chrome/android/java/res_chromium/drawable-mdpi/product_logo_name.png",
"//chrome/android/java/res_chromium/drawable-xhdpi/fre_product_logo.png",
"//chrome/android/java/res_chromium/drawable-xhdpi/product_logo_name.png",
"//chrome/android/java/res_chromium/drawable-xxhdpi/fre_product_logo.png",
"//chrome/android/java/res_chromium/drawable-xxhdpi/product_logo_name.png",
"//chrome/android/java/res_chromium/drawable-xxxhdpi/fre_product_logo.png",
"//chrome/android/java/res_chromium/drawable-xxxhdpi/product_logo_name.png",
"//chrome/android/java/res_chromium/mipmap-hdpi/app_icon.png",
"//chrome/android/java/res_chromium/mipmap-hdpi/app_shortcut_icon.png",
"//chrome/android/java/res_chromium/mipmap-hdpi/app_single_page_icon.png",
"//chrome/android/java/res_chromium/mipmap-mdpi/app_icon.png",
"//chrome/android/java/res_chromium/mipmap-mdpi/app_shortcut_icon.png",
"//chrome/android/java/res_chromium/mipmap-mdpi/app_single_page_icon.png",
"//chrome/android/java/res_chromium/mipmap-xhdpi/app_icon.png",
"//chrome/android/java/res_chromium/mipmap-xhdpi/app_shortcut_icon.png",
"//chrome/android/java/res_chromium/mipmap-xhdpi/app_single_page_icon.png",
"//chrome/android/java/res_chromium/mipmap-xxhdpi/app_icon.png",
"//chrome/android/java/res_chromium/mipmap-xxhdpi/app_shortcut_icon.png",
"//chrome/android/java/res_chromium/mipmap-xxhdpi/app_single_page_icon.png",
"//chrome/android/java/res_chromium/mipmap-xxxhdpi/app_icon.png",
"//chrome/android/java/res_chromium/mipmap-xxxhdpi/app_shortcut_icon.png",
"//chrome/android/java/res_chromium/mipmap-xxxhdpi/app_single_page_icon.png",
"//chrome/android/java/res_chromium/values/channel_constants.xml",
]
deps = [
......@@ -178,7 +204,13 @@ if (enable_vr) {
# resource target may clobber some resources. Once that is fixed we should add
# the VR resurces to chrome_app_java_resources.
android_resources("chrome_vr_java_resources") {
resource_dirs = [ "//chrome/android/java/res_vr" ]
sources = [
"//chrome/android/java/res_vr/drawable-nodpi/daydream_icon_background.png",
"//chrome/android/java/res_vr/drawable-nodpi/daydream_icon_foreground.png",
"//chrome/android/java/res_vr/values-v17/styles.xml",
"//chrome/android/java/res_vr/values-vrheadset-v26/styles.xml",
"//chrome/android/java/res_vr/values/values.xml",
]
deps = [ ":chrome_app_java_resources" ]
}
}
......@@ -186,7 +218,7 @@ if (enable_vr) {
# TODO (crbug/1058764) Unfork credential leak dialog password change when prototype is done.
if (enable_password_change_in_leaked_dialog) {
android_resources("password_change_resources") {
resource_dirs = [ "//chrome/android/java/res_password_change" ]
sources = [ "//chrome/android/java/res_password_change/layout/password_manager_dialog_with_help_button_password_change.xml" ]
deps = [ ":chrome_app_java_resources" ]
custom_package = "org.chromium.chrome.password_change"
}
......@@ -194,7 +226,7 @@ if (enable_password_change_in_leaked_dialog) {
# TODO(chouinard): Remove this wrapper target after downstream dependencies on it are replaced.
android_resources("chrome_download_java_resources") {
resource_dirs = []
sources = []
deps = [ "//chrome/browser/download/android:java_resources" ]
}
......@@ -1137,7 +1169,34 @@ if (enable_vr || enable_arcore) {
# Overrides icon / name defined in chrome_app_java_resources.
android_resources("chrome_public_apk_resources") {
resource_dirs = [ "java/res_chromium" ]
sources = [
"java/res_chromium/drawable-hdpi/fre_product_logo.png",
"java/res_chromium/drawable-hdpi/product_logo_name.png",
"java/res_chromium/drawable-mdpi/fre_product_logo.png",
"java/res_chromium/drawable-mdpi/product_logo_name.png",
"java/res_chromium/drawable-xhdpi/fre_product_logo.png",
"java/res_chromium/drawable-xhdpi/product_logo_name.png",
"java/res_chromium/drawable-xxhdpi/fre_product_logo.png",
"java/res_chromium/drawable-xxhdpi/product_logo_name.png",
"java/res_chromium/drawable-xxxhdpi/fre_product_logo.png",
"java/res_chromium/drawable-xxxhdpi/product_logo_name.png",
"java/res_chromium/mipmap-hdpi/app_icon.png",
"java/res_chromium/mipmap-hdpi/app_shortcut_icon.png",
"java/res_chromium/mipmap-hdpi/app_single_page_icon.png",
"java/res_chromium/mipmap-mdpi/app_icon.png",
"java/res_chromium/mipmap-mdpi/app_shortcut_icon.png",
"java/res_chromium/mipmap-mdpi/app_single_page_icon.png",
"java/res_chromium/mipmap-xhdpi/app_icon.png",
"java/res_chromium/mipmap-xhdpi/app_shortcut_icon.png",
"java/res_chromium/mipmap-xhdpi/app_single_page_icon.png",
"java/res_chromium/mipmap-xxhdpi/app_icon.png",
"java/res_chromium/mipmap-xxhdpi/app_shortcut_icon.png",
"java/res_chromium/mipmap-xxhdpi/app_single_page_icon.png",
"java/res_chromium/mipmap-xxxhdpi/app_icon.png",
"java/res_chromium/mipmap-xxxhdpi/app_shortcut_icon.png",
"java/res_chromium/mipmap-xxxhdpi/app_single_page_icon.png",
"java/res_chromium/values/channel_constants.xml",
]
# Dep needed to ensure override works properly.
deps = [ ":chrome_app_java_resources" ]
......@@ -1898,7 +1957,7 @@ if (public_android_sdk) {
# generate APK stubs.
android_resources("trichrome_dummy_resources") {
custom_package = "org.chromium.trichromelibrary"
resource_dirs = [ "trichrome/res_dummy" ]
sources = [ "trichrome/res_dummy/values/strings.xml" ]
}
chrome_public_test_apk_manifest =
......
......@@ -11,6 +11,7 @@ yusufo@chromium.org
per-file static_initializers.gni=*
per-file java_sources.gni=*
per-file chrome_java_sources.gni=*
per-file chrome_java_resources.gni=*
per-file chrome_test_java_sources.gni=*
per-file chrome_junit_test_java_sources.gni=*
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment