Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(395)

Unified Diff: build/config/android/internal_rules.gni

Issue 2629663003: Reland of Android: Delete rezip in favor of zipalign -p (Closed)
Patch Set: no gdbserver Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/rezip/RezipApk.java ('k') | build/config/android/rules.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index b7a42d34657803380fb6e7f4c2cb7913b202f196..eee8bcaec9970ee8b02be5f7dc178669de2e0b2e 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -32,7 +32,6 @@ _java_target_whitelist = [
# TODO(agrieve): Rename targets below to match above patterns.
"*android_webview/glue:glue",
- "//build/android/rezip:rezip",
"//chrome/test/android/cast_emulator:cast_emulator",
]
@@ -1393,7 +1392,6 @@ if (enable_java_templates) {
# keystore_path: Path to keystore to use for signing.
# keystore_name: Key alias to use.
# keystore_password: Keystore password.
- # rezip_apk: Whether to add crazy-linker alignment.
template("finalize_apk") {
action(target_name) {
deps = []
@@ -1436,20 +1434,6 @@ if (enable_java_templates) {
"--key-passwd",
invoker.keystore_password,
]
- if (defined(invoker.rezip_apk) && invoker.rezip_apk) {
- deps += [ "//build/android/rezip" ]
- _rezip_jar_path = "$root_build_dir/lib.java/rezip_apk.jar"
- args += [
- "--load-library-from-zip=1",
- "--rezip-apk-jar-path",
- rebase_path(_rezip_jar_path, root_build_dir),
- ]
- }
-
- if (defined(invoker.page_align_shared_libraries) &&
- invoker.page_align_shared_libraries) {
- args += [ "--page-align-shared-libraries" ]
- }
}
}
@@ -1692,6 +1676,9 @@ if (enable_java_templates) {
"uncompress_shared_libraries",
"write_asset_list",
])
+ if (!defined(uncompress_shared_libraries)) {
+ uncompress_shared_libraries = _load_library_from_apk
+ }
deps = _deps + [ ":${_package_resources_target_name}" ]
native_libs = _native_libs + _native_libs_even_when_incremental
@@ -1712,6 +1699,9 @@ if (enable_java_templates) {
"secondary_native_libs",
"uncompress_shared_libraries",
])
+ if (!defined(uncompress_shared_libraries)) {
+ uncompress_shared_libraries = _load_library_from_apk
+ }
_dex_target = "//build/android/incremental_install:bootstrap_java__dex"
deps = _incremental_deps + [
":${_incremental_package_resources_target_name}",
@@ -1738,14 +1728,11 @@ if (enable_java_templates) {
_finalize_apk_rule_name = "${target_name}__finalize"
finalize_apk(_finalize_apk_rule_name) {
- forward_variables_from(invoker, [ "page_align_shared_libraries" ])
-
input_apk_path = _packaged_apk_path
output_apk_path = _final_apk_path
keystore_path = _keystore_path
keystore_name = _keystore_name
keystore_password = _keystore_password
- rezip_apk = _load_library_from_apk
public_deps = [
# Generator of the _packaged_apk_path this target takes as input.
« no previous file with comments | « build/android/rezip/RezipApk.java ('k') | build/config/android/rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698