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

7 Коммитов

Автор SHA1 Сообщение Дата
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