Граф коммитов

19 Коммитов

Автор SHA1 Сообщение Дата
agrieve f0ec0b915a Rename load_library_from_zip_file -> load_library_from_zip
Having load_library_from_zip_file end with "_file" causes a GYP
exception when the value is overriden.

BUG=488135

Review URL: https://codereview.chromium.org/1142353003

Cr-Original-Commit-Position: refs/heads/master@{#330888}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 1b841e014d528f802b93c4284b90db39b90b63fc
2015-05-21 04:40:12 +00:00
agrieve 604f545e1e 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-Original-Commit-Position: refs/heads/master@{#330523}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 63349e4f235ae666faff75c1eee2da001fb7341f
2015-05-19 16:58:51 +00:00
torne 1f6e035226 Remove most android_webview_build conditions from build.
Remove most references to android_webview_build from the build directory
now that we no longer support that build configuration. Fold conditions
into their parents where appropriate. Leave the variable itself defined
to 0 as not all uses in the tree have been removed yet.

A few references are left alone here and will be removed separately in
later changes that will be larger refactorings to eliminate other
variables.

BUG=440793

Review URL: https://codereview.chromium.org/1043913002

Cr-Original-Commit-Position: refs/heads/master@{#323013}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: c6fe7a775af41cd98533e89a902b8b67044caa87
2015-03-31 11:51:32 +00:00
mstrum 7b3fc76665 Fix comment describing how to use finalize_apk_action.gypi
The existing comment references the old name of finalize_apk_action.gypi, this
updates it to its current name.

This also reorders the input list to be alphabetized.

Review URL: https://codereview.chromium.org/899063002

Cr-Original-Commit-Position: refs/heads/master@{#314656}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 81d5159b4693364739934f8bd698711cd5eca715
2015-02-04 22:16:58 +00:00
aurimas 8aec7db1f6 Roll Android SDK to v21
BUG=424680

Review URL: https://codereview.chromium.org/661073003

Cr-Original-Commit-Position: refs/heads/master@{#300193}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 1030b8fdea68fc3eaacde474fb57742e37e249f4
2014-10-18 01:12:04 +00:00
anton 25fbac3e82 Add rename and inflate support to the RezipApk tool.
This removes the need to use the previous "rezip" tool in the build
process. That tool is still used in the LGPL compliance script,
which will need to be addressed separately.

BUG=390618, 388223

Review URL: https://codereview.chromium.org/608853005

Cr-Original-Commit-Position: refs/heads/master@{#297866}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 5887c778a800c9000e9565b40da65e9979657afd
2014-10-02 18:20:46 +00:00
anton 32c2b97e20 Re-invent page aligning libraries in APK file.
With this change setting 'load_library_from_zip_file' to 1 will now
construct the APK with a new tool chain. The purpose of this change is
to contruct the APK in such a way that the page alignment is not broken
by the chrome signing process. To achieve this the tool is written in
Java so it shares the same underlying JarOutputStream implementation.
The key things that we depend on are that the filenames are output in
lexographical order with the META_INF files at the end of the file.
That zipalign adds 4 byte alignment to STORED files and this is done by
adding padding to the zip extra field.

BUG=390618

Review URL: https://codereview.chromium.org/595933003

Cr-Original-Commit-Position: refs/heads/master@{#297439}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: c83a88d39329e2a7d8bbc1de280d9e572d2f7c8a
2014-09-30 17:15:52 +00:00
anton@chromium.org b77c957d67 Add support for uncompress library in APK to the build system
BUG=

Review URL: https://codereview.chromium.org/334413006

git-svn-id: http://src.chromium.org/svn/trunk/src/build@280346 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-06-27 16:59:46 +00:00
yusufo@chromium.org f034cc1c52 Finalize apk takes zipalign path as argument instead of hardcoding it
zipalign tool can be in sdk/tools or sdk/build-tools. This change looks
for the right place and uses that instead of having it hardcoded inside
android_sdk_root

BUG=364655

Review URL: https://codereview.chromium.org/238253015

git-svn-id: http://src.chromium.org/svn/trunk/src/build@264842 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-04-18 20:22:43 +00:00
kerz@chromium.org db1cb8b67e Update APK generation scripts to take custom keystore names and passwords.
R=klobag,cjhopman

Review URL: https://codereview.chromium.org/207743005

git-svn-id: http://src.chromium.org/svn/trunk/src/build@259420 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-03-26 00:43:37 +00:00
thakis@chromium.org 563c12e9b1 android: Remove unused 'inputs' parameter for finalize_apk_action.gypi.
This allows removing a now-unneeded md5sum invocation too,
which in turn allows removing finalize_apk.py's --ignored parameter.
No intended behavior change.

BUG=177552
R=cjhopman@chromium.org

Review URL: https://codereview.chromium.org/187333002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@255114 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-03-05 19:41:20 +00:00
thakis@chromium.org 4cef26f0d7 Remove trailing "." from message lines.
cs.chromium.org has way fewer hits for
    'message'.*\.',?$ file:gyp
than for
    'message'.*[^\.]',?$ file:gyp

so standardize on the latter.

BUG=none
TEST=less ocd when watching build output
NOTRY=true

Review URL: https://codereview.chromium.org/51843002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@232166 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2013-10-31 18:08:28 +00:00
wjia@chromium.org 22e10e1e19 Fix check_perms for r208246
Reland https://codereview.chromium.org/17569006/ with check_perms fix.

Support using loadable module for libpeerconnection on Android.

Borrowed create_standalone_apk_action.gypi, create_standalone_apk.py and finalize_apk_action.gypi from https://codereview.chromium.org/14843017/ with some minor fix in create_standalone_apk_action.gypi.

For some cases where libpeerconnection needs to be a loadable module, we need to add libpeerconnection.so into Chrome_apk.
This patch takes 2 steps:
1. build chrome with libpeer_target_type=loadable_module.
2. add libpeerconnection.so into the apk file.

TEST=run gyp: GYP_DEFINES="$GYP_DEFINES libpeer_target_type=loadable_module" build/gyp_chromium
build chrome
re-run gyp: GYP_DEFINES="$GYP_DEFINES libpeer_target_type=loadable_module" CHROMIUM_GYP_FILE="build/android/chrome_with_libs.gyp" build/gyp_chromium
build chrome_with_libs
install Chrome-with-libs.apk and it works for https://apprtc.appspot.com

Review URL: https://codereview.chromium.org/17647002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@208304 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2013-06-24 23:44:40 +00:00
abodenha@chromium.org 3ee66a772b Revert 208246 "Support using loadable module for libpeerconnecti..."
Caused check_perms failure on Linux ChromiumOS.
See http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Full/builds/21371

> Support using loadable module for libpeerconnection on Android.
> 
> Borrowed create_standalone_apk_action.gypi, create_standalone_apk.py and finalize_apk_action.gypi from https://codereview.chromium.org/14843017/ with some minor fix in create_standalone_apk_action.gypi.
> 
> For some cases where libpeerconnection needs to be a loadable module, we need to add libpeerconnection.so into Chrome_apk.
> This patch takes 2 steps:
> 1. build chrome with libpeer_target_type=loadable_module.
> 2. add libpeerconnection.so into the apk file.
> 
> TEST=run gyp: GYP_DEFINES="$GYP_DEFINES libpeer_target_type=loadable_module" build/gyp_chromium
>      build chrome
>      re-run gyp: GYP_DEFINES="$GYP_DEFINES libpeer_target_type=loadable_module" CHROMIUM_GYP_FILE="build/android/chrome_with_libs.gyp" build/gyp_chromium
>      build chrome_with_libs
>      install Chrome-with-libs.apk and it works for https://apprtc.appspot.com
> 
> R=cjhopman@chromium.org, mallinath@chromium.org, tommi@chromium.org
> 
> Review URL: https://codereview.chromium.org/17569006

TBR=wjia@chromium.org

Review URL: https://codereview.chromium.org/17573017

git-svn-id: http://src.chromium.org/svn/trunk/src/build@208285 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2013-06-24 22:58:03 +00:00
wjia@chromium.org e13c37b8d0 Support using loadable module for libpeerconnection on Android.
Borrowed create_standalone_apk_action.gypi, create_standalone_apk.py and finalize_apk_action.gypi from https://codereview.chromium.org/14843017/ with some minor fix in create_standalone_apk_action.gypi.

For some cases where libpeerconnection needs to be a loadable module, we need to add libpeerconnection.so into Chrome_apk.
This patch takes 2 steps:
1. build chrome with libpeer_target_type=loadable_module.
2. add libpeerconnection.so into the apk file.

TEST=run gyp: GYP_DEFINES="$GYP_DEFINES libpeer_target_type=loadable_module" build/gyp_chromium
     build chrome
     re-run gyp: GYP_DEFINES="$GYP_DEFINES libpeer_target_type=loadable_module" CHROMIUM_GYP_FILE="build/android/chrome_with_libs.gyp" build/gyp_chromium
     build chrome_with_libs
     install Chrome-with-libs.apk and it works for https://apprtc.appspot.com

R=cjhopman@chromium.org, mallinath@chromium.org, tommi@chromium.org

Review URL: https://codereview.chromium.org/17569006

git-svn-id: http://src.chromium.org/svn/trunk/src/build@208246 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2013-06-24 18:54:11 +00:00
dfalcantara@chromium.org 458e6b0e2b Revert "[Android] Support building standalone APK in component build"
This breaks the Android component build.

This reverts commit 125e64a9eb6406446fb864aea9fa887521f19616.
>> [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/.
>>
>> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=207345
>>
>> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=207516

BUG=
R=cjhopman@chromium.org

Review URL: https://codereview.chromium.org/17291013

git-svn-id: http://src.chromium.org/svn/trunk/src/build@207587 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2013-06-20 21:42:06 +00:00
cjhopman@chromium.org f00dfb88a8 [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/.

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=207345

Review URL: https://chromiumcodereview.appspot.com/14843017

git-svn-id: http://src.chromium.org/svn/trunk/src/build@207516 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2013-06-20 19:51:29 +00:00
skyostil@google.com 283725629a 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: http://src.chromium.org/svn/trunk/src/build@207439 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2013-06-20 15:31:28 +00:00
cjhopman@chromium.org 7ad7e2169a [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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@207345 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2013-06-20 07:58:19 +00:00