Skip to content

GitLab

T
tangled
Commit 730fa6b3 authored by Justin Donnelly's avatar Justin Donnelly Committed by Commit Bot
Browse files
Options

Revert "Android: Skip incremental install json for targets that don't support it" 

This reverts commit 12435aaa.

Reason for revert: Suspected of breaking the build on android-rel and closing the tree.

See https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/android-rel/1629 for the error, which references "incremental" and "json".

Original change's description:
> Android: Skip incremental install json for targets that don't support it
> 
> Change-Id: I111afe4c1cd7c0c152333d678c22dc9eb284adf3
> Reviewed-on: https://chromium-review.googlesource.com/1205805
> Commit-Queue: agrieve <agrieve@chromium.org>
> Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#589523}

TBR=agrieve@chromium.org,tiborg@chromium.org

Change-Id: Ibc19c427d9afa4db971c46fa92aa05e8eb52f168
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/1213370Reviewed-by: default avatarJustin Donnelly <jdonnelly@chromium.org>
Commit-Queue: Justin Donnelly <jdonnelly@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589527}
parent 79e1ed69
Show whitespace changes
Inline Side-by-side
Showing with 69 additions and 74 deletions
build/config/android/internal_rules.gni
View file @ 730fa6b3
......@@ -320,18 +320,18 @@ template("write_build_config") {
if (defined(invoker.apk_path)) {
_rebased_apk_path = rebase_path(invoker.apk_path, root_build_dir)
_incremental_allowed =
defined(invoker.incremental_allowed) && invoker.incremental_allowed
args += [ "--apk-path=$_rebased_apk_path" ]
if (_incremental_allowed) {
_rebased_incremental_apk_path =
rebase_path(invoker.incremental_apk_path, root_build_dir)
_rebased_incremental_install_json_path =
rebase_path(invoker.incremental_install_json_path, root_build_dir)
args += [
"--incremental-install-json-path=$_rebased_incremental_install_json_path",
"--incremental-apk-path=$_rebased_incremental_apk_path",
]
_incremental_allowed =
defined(invoker.incremental_allowed) && invoker.incremental_allowed
args += [ "--apk-path=$_rebased_apk_path" ]
args += [ "--incremental-install-json-path=$_rebased_incremental_install_json_path" ]
assert(_rebased_incremental_apk_path != "") # Mark as used.
if (_incremental_allowed) {
args += [ "--incremental-apk-path=$_rebased_incremental_apk_path" ]
}
}
......
build/config/android/rules.gni
View file @ 730fa6b3
......@@ -1914,6 +1914,7 @@ if (enable_java_templates) {
# directory or they will not be available to tester bots.
_jar_path = "$_base_path.jar"
_lib_dex_path = "$_base_path.dex.jar"
_rebased_lib_dex_path = rebase_path(_lib_dex_path, root_build_dir)
_template_name = target_name
_is_bundle_module =
......@@ -1952,6 +1953,9 @@ if (enable_java_templates) {
rebase_path(_final_apk_path_no_ext, root_build_dir) + ".ap_"
}
_target_dir_name = get_label_info(target_name, "dir")
_incremental_install_json_path = "$root_out_dir/gen.runtime/$_target_dir_name/$target_name.incremental.json"
_version_code = android_default_version_code
if (defined(invoker.version_code)) {
_version_code = invoker.version_code
......@@ -2092,7 +2096,6 @@ if (enable_java_templates) {
}
_rebased_build_config = rebase_path(_build_config, root_build_dir)
assert(_rebased_build_config != "") # Mark as used.
_generate_buildconfig_java = !defined(invoker.apk_under_test)
if (defined(invoker.generate_buildconfig_java)) {
......@@ -2109,10 +2112,6 @@ if (enable_java_templates) {
_incremental_allowed =
!_is_bundle_module &&
!(defined(invoker.never_incremental) && invoker.never_incremental)
if (_incremental_allowed) {
_target_dir_name = get_label_info(target_name, "dir")
_incremental_install_json_path = "$root_out_dir/gen.runtime/$_target_dir_name/$target_name.incremental.json"
}
_android_manifest =
"$target_gen_dir/${_template_name}_manifest/AndroidManifest.xml"
......@@ -2315,11 +2314,10 @@ if (enable_java_templates) {
_srcjar_deps += [ ":${_template_name}__native_libraries_java" ]
}
_extra_native_libs = []
_extra_native_libs = _sanitizer_runtimes
_extra_native_libs_deps = []
assert(_extra_native_libs_deps == []) # Mark as used.
if (_native_libs_deps != []) {
_extra_native_libs += _sanitizer_runtimes
if (_use_chromium_linker) {
_extra_native_libs +=
[ "$root_out_dir/libchromium_android_linker$shlib_extension" ]
......@@ -2384,11 +2382,9 @@ if (enable_java_templates) {
if (!_is_bundle_module) {
apk_path = _final_apk_path
incremental_allowed = _incremental_allowed
if (_incremental_allowed) {
incremental_apk_path = "${_final_apk_path_no_ext}_incremental.apk"
incremental_install_json_path = _incremental_install_json_path
}
}
proguard_enabled = _proguard_enabled
if (_proguard_enabled) {
......@@ -2537,16 +2533,16 @@ if (enable_java_templates) {
_final_deps += [ ":$_java_target" ]
}
_all_native_libs_deps = []
if (_native_libs_deps != []) {
_native_libs_file_arg_dep = ":$_build_config_target"
if (!_is_bundle_module) {
_native_libs_file_arg =
"@FileArg($_rebased_build_config:native:libraries)"
}
_all_native_libs_deps += _native_libs_deps + _extra_native_libs_deps +
_native_libs_file_arg = "@FileArg($_rebased_build_config:native:libraries)"
_secondary_abi_native_libs_file_arg_dep = ":$_build_config_target"
_secondary_abi_native_libs_file_arg =
"@FileArg($_rebased_build_config:native:secondary_abi_libraries)"
assert(_secondary_abi_native_libs_file_arg != "" &&
_secondary_abi_native_libs_file_arg_dep != "") # Mark as used.
_all_native_libs_deps = _native_libs_deps + _extra_native_libs_deps +
[ _native_libs_file_arg_dep ]
}
assert(_all_native_libs_deps == _all_native_libs_deps) # Mark as used.
_extra_native_libs_even_when_incremental = []
assert(_extra_native_libs_even_when_incremental == []) # Mark as used.
......@@ -2633,17 +2629,18 @@ if (enable_java_templates) {
if (_native_libs_deps != [] ||
_extra_native_libs_even_when_incremental != []) {
deps += _all_native_libs_deps
native_libs_filearg = _native_libs_file_arg
native_libs = _extra_native_libs
native_libs_even_when_incremental =
_extra_native_libs_even_when_incremental
}
deps += _all_native_libs_deps
if (_secondary_abi_native_libs_deps != []) {
deps += _secondary_abi_native_libs_deps
deps += _secondary_abi_native_libs_deps +
[ _secondary_abi_native_libs_file_arg_dep ]
secondary_abi_native_libs_filearg =
"@FileArg($_rebased_build_config:native:secondary_abi_libraries)"
_secondary_abi_native_libs_file_arg
}
# Placeholders necessary for some older devices.
......@@ -2670,11 +2667,12 @@ if (enable_java_templates) {
] + _all_native_libs_deps + _secondary_abi_native_libs_deps
}
if (_incremental_allowed) {
_write_installer_json_rule_name = "${_template_name}__incremental_json"
action_with_pydeps(_write_installer_json_rule_name) {
script = "//build/android/incremental_install/write_installer_json.py"
deps = []
deps = [
_native_libs_file_arg_dep,
]
data = [
_incremental_install_json_path,
......@@ -2687,7 +2685,6 @@ if (enable_java_templates) {
rebase_path(_final_apk_path_no_ext, root_build_dir)
_rebased_incremental_install_json_path =
rebase_path(_incremental_install_json_path, root_build_dir)
_rebased_lib_dex_path = rebase_path(_lib_dex_path, root_build_dir)
_dex_arg_key = "${_rebased_build_config}:final_dex:dependency_dex_files"
args = [
"--apk-path=${_rebased_apk_path_no_ext}_incremental.apk",
......@@ -2698,9 +2695,8 @@ if (enable_java_templates) {
if (_proguard_enabled) {
args += [ "--show-proguard-warning" ]
}
if (_native_libs_deps != []) {
if (defined(_native_libs_file_arg)) {
args += [ "--native-libs=$_native_libs_file_arg" ]
deps += [ _native_libs_file_arg_dep ]
}
if (_extra_native_libs != []) {
_rebased_extra_native_libs =
......@@ -2711,10 +2707,9 @@ if (enable_java_templates) {
args += [ "--dont-even-try=Incremental builds do not work with load_library_from_apk. Try setting is_component_build=true in your GN args." ]
}
}
_incremental_apk_operations = []
}
_apk_operations = []
_incremental_apk_operations = []
# Generate apk operation related script.
if (!defined(invoker.create_apk_script) || invoker.create_apk_script) {
......@@ -2758,10 +2753,8 @@ if (enable_java_templates) {
}
}
_apk_operations += [ ":$_apk_operations_target_name" ]
if (_incremental_allowed) {
_incremental_apk_operations += [ ":$_apk_operations_target_name" ]
}
}
group(target_name) {
if (_incremental_allowed && incremental_apk_by_default) {
......@@ -2816,6 +2809,8 @@ if (enable_java_templates) {
# Generate incremental apk related operations at runtime.
public_deps += _incremental_apk_operations
}
} else {
not_needed([ "_incremental_apk_operations" ])
}
}
......
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