From 63349e4f235ae666faff75c1eee2da001fb7341f Mon Sep 17 00:00:00 2001 From: agrieve Date: Tue, 19 May 2015 09:58:32 -0700 Subject: Add use_apk_split parameter to java_apk.gypi / android_apk (gn) Testing: - For GN, splits install and crash on start-up just like non-split version - For GYP, tested with: - component=shared_library, component=static_library - gyp_managed_install=1, 0 - load_library_from_zip_file=1, 0 BUG=484797 Review URL: https://codereview.chromium.org/1137313003 Cr-Commit-Position: refs/heads/master@{#330523} --- build/android/finalize_apk_action.gypi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'build/android') diff --git a/build/android/finalize_apk_action.gypi b/build/android/finalize_apk_action.gypi index bdf9966..0818d97 100644 --- a/build/android/finalize_apk_action.gypi +++ b/build/android/finalize_apk_action.gypi @@ -24,6 +24,7 @@ 'keystore_password%': 'chromium', 'zipalign_path%': '<(android_sdk_tools)/zipalign', 'rezip_apk_jar_path%': '<(PRODUCT_DIR)/lib.java/rezip_apk.jar', + 'load_library_from_zip%': 0, }, 'inputs': [ '<(DEPTH)/build/android/gyp/finalize_apk.py', @@ -42,7 +43,7 @@ '--key-path=<(keystore_path)', '--key-name=<(keystore_name)', '--key-passwd=<(keystore_password)', - '--load-library-from-zip-file=<(load_library_from_zip_file)', + '--load-library-from-zip-file=<(load_library_from_zip)', '--rezip-apk-jar-path=<(rezip_apk_jar_path)', ], } -- cgit v1.1