mozilla
/
chromium-src-build
зеркало из https://github.com/mozilla/chromium-src-build.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Move Android resource_zip files into own build subdir. 

Want to move resources.zip files out of gen/ directory since they
won't get packaged by several of the Builder bots. We will need
these resources.zip files for JUnit tests.

BUG=693573

Review-Url: https://codereview.chromium.org/2862603002
Cr-Original-Commit-Position: refs/heads/master@{#469191}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 54c8a0f1de1a3cf8599dde9efb7bc61f08fef03f
This commit is contained in:
mikecase 2017-05-03 16:18:56 -07:00 коммит произвёл Commit bot
Родитель 2ce5b4207d
Коммит ddd7ce1bf4
2 изменённых файлов: 54 добавлений и 33 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

56
android/lint/suppressions.xml
Просмотреть файл

@ -143,11 +143,11 @@ Still reading?
<ignore regexp="tools/android/push_apps_to_background/res"/>
</issue>
<issue id="ImpliedQuantity" severity="Error">
<ignore regexp="gen/chrome/android/chrome_strings_grd"/>
<ignore regexp="chrome/android/chrome_strings_grd"/>
</issue>
<issue id="InconsistentArrays" severity="Error">
<ignore regexp="gen/android_webview/locale_paks.resources.zip/values/locale-paks.xml"/>
<ignore regexp="gen/chrome/android/chrome_locale_paks.resources.zip/values/locale-paks.xml"/>
<ignore regexp="android_webview/locale_paks.resources.zip/values/locale-paks.xml"/>
<ignore regexp="chrome/android/chrome_locale_paks.resources.zip/values/locale-paks.xml"/>
</issue>
<issue id="InconsistentLayout" severity="ignore"/>
<issue id="InefficientWeight" severity="Error">
@ -241,8 +241,8 @@ Still reading?
<ignore regexp="chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/WebApkValidator.java"/>
</issue>
<issue id="PluralsCandidate" severity="Error">
<ignore regexp="gen/chrome/android/chrome_strings_grd.resources.zip/values-en-rGB/android_chrome_strings.xml"/>
<ignore regexp="gen/chrome/android/chrome_strings_grd.resources.zip/values/android_chrome_strings.xml"/>
<ignore regexp="chrome/android/chrome_strings_grd.resources.zip/values-en-rGB/android_chrome_strings.xml"/>
<ignore regexp="chrome/android/chrome_strings_grd.resources.zip/values/android_chrome_strings.xml"/>
</issue>
<issue id="Recycle" severity="ignore"/>
<issue id="Registered" severity="ignore"/>
@ -261,17 +261,17 @@ Still reading?
<ignore regexp="chromecast/internal"/>
</issue>
<issue id="StringFormatCount" severity="Error">
<ignore regexp="gen/chrome/android/chrome_strings_grd.resources.zip/values-cs/android_chrome_strings.xml"/>
<ignore regexp="gen/chrome/android/chrome_strings_grd.resources.zip/values-pl/android_chrome_strings.xml"/>
<ignore regexp="gen/chrome/android/chrome_strings_grd.resources.zip/values/android_chrome_strings.xml"/>
<ignore regexp="chrome/android/chrome_strings_grd.resources.zip/values-cs/android_chrome_strings.xml"/>
<ignore regexp="chrome/android/chrome_strings_grd.resources.zip/values-pl/android_chrome_strings.xml"/>
<ignore regexp="chrome/android/chrome_strings_grd.resources.zip/values/android_chrome_strings.xml"/>
</issue>
<issue id="StringFormatInvalid" severity="Error">
<ignore regexp="gen/chrome/android/chrome_strings_grd.resources.zip/values-cs/android_chrome_strings.xml"/>
<ignore regexp="gen/chrome/android/chrome_strings_grd.resources.zip/values-da/android_chrome_strings.xml"/>
<ignore regexp="gen/chrome/android/chrome_strings_grd.resources.zip/values-pl/android_chrome_strings.xml"/>
<ignore regexp="gen/chrome/android/chrome_strings_grd.resources.zip/values-pt-rBR/android_chrome_strings.xml"/>
<ignore regexp="gen/chrome/android/chrome_strings_grd.resources.zip/values-sv/android_chrome_strings.xml"/>
<ignore regexp="gen/chrome/android/chrome_strings_grd.resources.zip/values-tl/android_chrome_strings.xml"/>
<ignore regexp="chrome/android/chrome_strings_grd.resources.zip/values-cs/android_chrome_strings.xml"/>
<ignore regexp="chrome/android/chrome_strings_grd.resources.zip/values-da/android_chrome_strings.xml"/>
<ignore regexp="chrome/android/chrome_strings_grd.resources.zip/values-pl/android_chrome_strings.xml"/>
<ignore regexp="chrome/android/chrome_strings_grd.resources.zip/values-pt-rBR/android_chrome_strings.xml"/>
<ignore regexp="chrome/android/chrome_strings_grd.resources.zip/values-sv/android_chrome_strings.xml"/>
<ignore regexp="chrome/android/chrome_strings_grd.resources.zip/values-tl/android_chrome_strings.xml"/>
</issue>
<issue id="TextFields" severity="Error">
<ignore regexp="chromecast/internal"/>
@ -284,16 +284,16 @@ Still reading?
<issue id="UnusedAttribute" severity="ignore"/>
<issue id="UnusedIds" severity="ignore"/>
<issue id="UnusedQuantity" severity="Error">
<ignore regexp="gen/chrome/android/chrome_strings_grd.resources.zip/values-cs/android_chrome_strings.xml"/>
<ignore regexp="gen/chrome/android/chrome_strings_grd.resources.zip/values-in/android_chrome_strings.xml"/>
<ignore regexp="gen/chrome/android/chrome_strings_grd.resources.zip/values-ja/android_chrome_strings.xml"/>
<ignore regexp="gen/chrome/android/chrome_strings_grd.resources.zip/values-ko/android_chrome_strings.xml"/>
<ignore regexp="gen/chrome/android/chrome_strings_grd.resources.zip/values-lt/android_chrome_strings.xml"/>
<ignore regexp="gen/chrome/android/chrome_strings_grd.resources.zip/values-sk/android_chrome_strings.xml"/>
<ignore regexp="gen/chrome/android/chrome_strings_grd.resources.zip/values-th/android_chrome_strings.xml"/>
<ignore regexp="gen/chrome/android/chrome_strings_grd.resources.zip/values-vi/android_chrome_strings.xml"/>
<ignore regexp="gen/chrome/android/chrome_strings_grd.resources.zip/values-zh-rCN/android_chrome_strings.xml"/>
<ignore regexp="gen/chrome/android/chrome_strings_grd.resources.zip/values-zh-rTW/android_chrome_strings.xml"/>
<ignore regexp="chrome/android/chrome_strings_grd.resources.zip/values-cs/android_chrome_strings.xml"/>
<ignore regexp="chrome/android/chrome_strings_grd.resources.zip/values-in/android_chrome_strings.xml"/>
<ignore regexp="chrome/android/chrome_strings_grd.resources.zip/values-ja/android_chrome_strings.xml"/>
<ignore regexp="chrome/android/chrome_strings_grd.resources.zip/values-ko/android_chrome_strings.xml"/>
<ignore regexp="chrome/android/chrome_strings_grd.resources.zip/values-lt/android_chrome_strings.xml"/>
<ignore regexp="chrome/android/chrome_strings_grd.resources.zip/values-sk/android_chrome_strings.xml"/>
<ignore regexp="chrome/android/chrome_strings_grd.resources.zip/values-th/android_chrome_strings.xml"/>
<ignore regexp="chrome/android/chrome_strings_grd.resources.zip/values-vi/android_chrome_strings.xml"/>
<ignore regexp="chrome/android/chrome_strings_grd.resources.zip/values-zh-rCN/android_chrome_strings.xml"/>
<ignore regexp="chrome/android/chrome_strings_grd.resources.zip/values-zh-rTW/android_chrome_strings.xml"/>
</issue>
<!-- TODO(crbug.com/635567): Fix this properly. -->
<issue id="UnusedResources" severity="ignore"/>
@ -343,10 +343,10 @@ Still reading?
<ignore regexp="chromecast/internal"/>
<ignore regexp="clank"/>
<ignore regexp="content/shell/android/java/res/mipmap-hdpi/app_icon.png"/>
<ignore regexp="gen/android_webview/locale_paks.resources.zip/*"/>
<ignore regexp="gen/android_webview/strings_grd.resources.zip/values/android_webview_strings.xml"/>
<ignore regexp="gen/components/strings/components_strings_grd.resources.zip/values.*/components_strings.xml"/>
<ignore regexp="gen/remoting/resources/strings_java.resources.zip/values/remoting_strings.xml"/>
<ignore regexp="android_webview/locale_paks.resources.zip/*"/>
<ignore regexp="android_webview/strings_grd.resources.zip/values/android_webview_strings.xml"/>
<ignore regexp="components/strings/components_strings_grd.resources.zip/values.*/components_strings.xml"/>
<ignore regexp="remoting/resources/strings_java.resources.zip/values/remoting_strings.xml"/>
<ignore regexp="remoting/android/java/res/drawable-hdpi/ic_backspace.png"/>
<ignore regexp="remoting/android/java/res/drawable-hdpi/ic_cardboard.png"/>
<ignore regexp="remoting/android/java/res/drawable-hdpi/ic_voice_input.png"/>

31
config/android/rules.gni
Просмотреть файл

@ -579,7 +579,11 @@ if (enable_java_templates) {
assert(defined(invoker.res_dir))
_base_path = "$target_gen_dir/$target_name"
_resources_zip = _base_path + ".resources.zip"
# JUnit tests use resource zip files. These must not be put in gen/
# directory or they will not be available to tester bots.
_resources_zip_rebased_path = rebase_path(target_gen_dir, root_gen_dir)
_resources_zip = "${root_out_dir}/resource_zips/${_resources_zip_rebased_path}/${target_name}.resources.zip"
_build_config = _base_path + ".build_config"
write_build_config("${target_name}__build_config") {
@ -676,7 +680,11 @@ if (enable_java_templates) {
assert(defined(invoker.resource_dirs))
base_path = "$target_gen_dir/$target_name"
zip_path = base_path + ".resources.zip"
# JUnit tests use resource zip files. These must not be put in gen/
# directory or they will not be available to tester bots.
_resources_zip_rebased_path = rebase_path(target_gen_dir, root_gen_dir)
zip_path = "${root_out_dir}/resource_zips/${_resources_zip_rebased_path}/${target_name}.resources.zip"
srcjar_path = base_path + ".srcjar"
r_text_out_path = base_path + "_R.txt"
build_config = base_path + ".build_config"
@ -895,7 +903,11 @@ if (enable_java_templates) {
forward_variables_from(invoker, [ "testonly" ])
base_path = "$target_gen_dir/$target_name"
resources_zip = base_path + ".resources.zip"
# JUnit tests use resource zip files. These must not be put in gen/
# directory or they will not be available to tester bots.
_resources_zip_rebased_path = rebase_path(target_gen_dir, root_gen_dir)
resources_zip = "${root_out_dir}/resource_zips/${_resources_zip_rebased_path}/${target_name}.resources.zip"
build_config = base_path + ".build_config"
write_build_config("${target_name}__build_config") {
@ -907,6 +919,7 @@ if (enable_java_templates) {
grit_target_name = "${target_name}__grit"
grit_output_dir = "$target_gen_dir/$extra_output_path"
grit(grit_target_name) {
forward_variables_from(invoker, [ "deps" ])
grit_flags = [
@ -961,7 +974,11 @@ if (enable_java_templates) {
forward_variables_from(invoker, [ "testonly" ])
base_path = "$target_gen_dir/$target_name"
resources_zip = base_path + ".resources.zip"
# JUnit tests use resource zip files. These must not be put in gen/
# directory or they will not be available to tester bots.
_resources_zip_rebased_path = rebase_path(target_gen_dir, root_gen_dir)
resources_zip = "${root_out_dir}/resource_zips/${_resources_zip_rebased_path}/${target_name}.resources.zip"
build_config = base_path + ".build_config"
build_config_target_name = "${target_name}__build_config"
@ -1516,7 +1533,11 @@ if (enable_java_templates) {
gen_dir = "$target_gen_dir/$target_name"
base_path = "$gen_dir/$target_name"
_build_config = "$target_gen_dir/$target_name.build_config"
resources_zip_path = "$base_path.resources.zip"
# JUnit tests use resource zip files. These must not be put in gen/
# directory or they will not be available to tester bots.
_resources_zip_rebased_path = rebase_path(target_gen_dir, root_gen_dir)
resources_zip_path = "${root_out_dir}/resource_zips/${_resources_zip_rebased_path}/${target_name}.resources.zip"
_all_resources_zip_path = "$base_path.resources.all.zip"
_jar_path = "$base_path.jar"
_lib_dex_path = "$base_path.dex.jar"