diff options
author | skyostil@google.com <skyostil@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 15:31:28 +0000 |
---|---|---|
committer | skyostil@google.com <skyostil@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 15:31:28 +0000 |
commit | 38ef36f44826408184e19a00fbba560a498d4677 (patch) | |
tree | edf950576820f1a20342ed8c4eb36fad6030f006 /build/android/create_standalone_apk_action.gypi | |
parent | a079f84dca0cf9c3fd6ae4f123491de917b9db6a (diff) | |
download | chromium_src-38ef36f44826408184e19a00fbba560a498d4677.zip chromium_src-38ef36f44826408184e19a00fbba560a498d4677.tar.gz chromium_src-38ef36f44826408184e19a00fbba560a498d4677.tar.bz2 |
Revert 207345 "[Android] Support building standalone APK in comp..."
This broke building of ChromeTest.apk. See:
http://chromegw.corp.google.com/i/clank.tot/builders/instrumentation-yakju-clankium-tot/builds/11555/steps/chrome_smoke_instrumentation_tests/logs/stdio
> [Android] Support building standalone APK in component build
>
> Many people's workflows assume that they can install the APK created in
> out/Debug/apks. With the component build that APK is actually an
> "incomplete" APK that cannot be manually installed (or rather causes
> obscure errors when manually installed).
>
> This change does two things. First, it moves the "incomplete" APK
> output to out/Debug/<package_name>/<ApkName>.apk. This should prevent
> accidental installs of the "incomplete" APK. Second, it introduces an
> option (create_standalone_apk) that when doing a component build, if
> set, will merge the shared libraries into the "incomplete" APK to
> create a standalone APK. This standalone APK will be created in
> out/Debug/apks/.
>
> Review URL: https://chromiumcodereview.appspot.com/14843017
TBR=cjhopman@chromium.org
Review URL: https://codereview.chromium.org/17484010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207439 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android/create_standalone_apk_action.gypi')
-rw-r--r-- | build/android/create_standalone_apk_action.gypi | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/build/android/create_standalone_apk_action.gypi b/build/android/create_standalone_apk_action.gypi deleted file mode 100644 index ca9c190..0000000 --- a/build/android/create_standalone_apk_action.gypi +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 2013 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# This file is meant to be included into an action to provide an action that -# combines a directory of shared libraries and an incomplete APK into a -# standalone APK. -# -# To use this, create a gyp action with the following form: -# { -# 'action_name': 'some descriptive action name', -# 'variables': { -# 'inputs': [ 'input_path1', 'input_path2' ], -# 'input_apk_path': '<(unsigned_apk_path)', -# 'output_apk_path': '<(unsigned_standalone_apk_path)', -# 'libraries_top_dir': '<(libraries_top_dir)', -# }, -# 'includes': [ 'relative/path/to/create_standalone_apk_action.gypi' ], -# }, - -{ - 'message': 'Creating standalone APK: <(output_apk_path)', - 'variables': { - 'inputs': [], - }, - 'inputs': [ - '<(DEPTH)/build/android/gyp/util/build_utils.py', - '<(DEPTH)/build/android/gyp/create_standalone_apk.py', - '<(input_apk_path)', - '>@(inputs)', - ], - 'outputs': [ - '<(output_apk_path)', - ], - 'action': [ - 'python', '<(DEPTH)/build/android/gyp/create_standalone_apk.py', - '--libraries-top-dir=<(libraries_top_dir)', - '--input-apk-path=<(unsigned_apk_path)', - '--output-apk-path=<(unsigned_standalone_apk_path)', - ], -} |