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

36 Коммитов

Автор SHA1 Сообщение Дата
peter@chromium.org 915fb10387 Revert 151110 - Fix ninja build for Android after http://codereview.chromium.org/10836080/
This CL broke the WebKit Android build bot and EWS bots by exporting
CC and CXX, which caused the global make settings as defined in gyp to be
ignored.

Original review URL: https://chromiumcodereview.appspot.com/10836192

TBR=yfriedman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10829296

git-svn-id: http://src.chromium.org/svn/trunk/src/build@151251 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-13 11:27:08 +00:00
yfriedman@chromium.org eb1732424e Fix ninja build for Android after http://codereview.chromium.org/10836080/
CC/CXX/AR now refer to target compilation.
We need to specifically set the host toolchain (CC_host, CX_host, AR_host) as well.

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@151110 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-10 19:47:19 +00:00
eugenis@chromium.org f531414f9d GYP changes for Clang/Android build.
TEST=none
BUG=137569


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@150779 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-09 10:44:07 +00:00
navabi@chromium.org d54e26964b Roll Android SDK in android_tools repo to api version 16.
The install-build-deps-android-sdk.sh is no longer necessary, since the SDK is checked out as part of the tree.  It is still useful as an easy way to install the SDK/NDK if we want to use an alternate (i.e. if we explicitly export ANDROID_SDK_ROOT it won't use the tree version).

BUG=


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@150499 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-08 04:47:02 +00:00
yfriedman@chromium.org 3f8dc720f8 Relanding 148377 - [Android] Upstream additional changes from envsetup.
Now requires you to specifically change the GYP_GENERATORS to specify Ninja. The original change broke because gyp ran for both make and ninja and the webkit bot determines whether to use ninja by the presence of build.ninja (thanks to Peter for figuring this out)

BUG=137569,136693


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@148790 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-27 20:36:53 +00:00
peter@chromium.org eda4291cc9 Revert 148377 - [Android] Upstream additional changes from envsetup.
This broke the Android WebKit bots as they switched to using Ninja, which
should have been tested before this landed.

---
Splits helper functions out of envsetup into envsetup_functions.sh.
Also includes device helper functions in
build/android/adb_device_functions.sh.

Finally, some fixes to build/common.gypi that happened when
cherry-picked down https://chromiumcodereview.appspot.com/10807019

BUG=137569,136693


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

TBR=yfriedman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10821066

git-svn-id: http://src.chromium.org/svn/trunk/src/build@148739 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-27 10:22:57 +00:00
yfriedman@chromium.org 5358cd8c63 [Android] Upstream additional changes from envsetup.
Splits helper functions out of envsetup into envsetup_functions.sh.
Also includes device helper functions in
build/android/adb_device_functions.sh.

Finally, some fixes to build/common.gypi that happened when
cherry-picked down https://chromiumcodereview.appspot.com/10807019

BUG=137569,136693


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@148377 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-25 19:15:00 +00:00
steveblock@chromium.org f5f7865054 Hook up use_system_libjpeg for Android
Also enable it by default when builing with the Android build system.

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@147850 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-23 13:36:12 +00:00
skyostil@chromium.org cf7efa4a59 Canonicalize CHROME_SRC variable on Android
If $PWD contains a symlink, build/android/envsetup.sh ends up setting
CHROME_SRC to the same symlinked path. This breaks some utilities (e.g.,
grit) that work with absolute paths and expect them to be prefixed by
CHROME_SRC.

The fix is to set CHROME_SRC to the canonical absolute path of the
current directory.

BUG=
TEST=cd $SYMLINKED_PATH; unset CHROME_SRC; . build/android/envsetup.sh; android_gyp


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@146097 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-11 10:23:52 +00:00
steveblock@chromium.org be1cca822e Specify path to aidl tool in gyp file
This avoids depending on having $PATH set up correctly when building, which can
be problematic when building with the Android build system.

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@145458 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-04 14:27:36 +00:00
steveblock@chromium.org f790e4ea8c Pass android_sdk as a variable to gyp
This avoids the need for shell script in the gyp file.


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@145195 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-02 21:26:03 +00:00
nileshagrawal@chromium.org dd5e4845a9 Build and run APK tests by default.
BUG=125059

TEST=

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@143478 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-06-21 22:46:24 +00:00
ilevy@chromium.org 0ffebc8764 Minor build/android/envsetup.sh tweaks
- Fixed todo comment
- Echoing gyp_generator variable when running android_gyp

BUG=
TEST=


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@142109 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-06-14 08:03:50 +00:00
wangxianzhu@chromium.org 253dfd874c Fix gyp on Android called by gclient or makefile regen
v8/build/common.gypi now uses environment variable CXX_target which is only
set in android_gyp, not set when gyp_chromium is called by gclient or automatic
makefile regeneration.

Now exports the environment variables needed by gyp generation.

BUG=none
TEST=none


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@140431 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-06-04 23:39:58 +00:00
james.wei@intel.com 524a46decf validate CHROME_SRC setting to avoid confusion
BUG=
TEST=


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@139480 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-05-30 07:44:21 +00:00
wangxianzhu@chromium.org 1b837b7e7d Fix break building v8 with goma
The error is caused by missing '-m32' parameter when building v8 for host.
  CXX(host) out/Release/obj.host/v8_base/v8/src/accessors.o
v8/src/globals.h:120:2: error: #error Target architecture arm is only supported on arm and ia32 host

v8/build/common.gypi tests if the compiler supports -m32:
  'm32flag': '<!((echo | $(echo ${CXX_host:-$(which g++)}) -m32 -E - > /dev/null 2>&1) && echo -n "-m32" || true)',
but goma is confused by the environment variable GOMA_WRAPPER and exits
with an error:
  GOMA_WRAPPER=<anything>: unkown GOMA_ parameter
and the gyp script thinks that the compiler doesn't support -m32.

Rename GOMA_WRAPPER to ANDROID_GOMA_WRAPPER to avoid confusing goma.

git-svn-id: http://src.chromium.org/svn/trunk/src/build@138916 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-05-24 22:43:23 +00:00
jrg@chromium.org e0a97f8d26 Add ${ANDROID_TOOLCHAIN} to $PATH to assist ninja.
Also minor upstreaming command movement.

BUG=
TEST=


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@137243 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-05-15 21:16:20 +00:00
jrg@chromium.org ee05979f3f Android content shell bringup.
Build media java files (we weren't).
Fix adb_install_content_shell for cases where the app was stuck.
Add upstream staging gyp var / #define.
Be more consistent about jar output files (all in lib.java).
Upstream a bunch of random files (e.g. ppapi).
Upstream a bunch of java and native code hit as part of shlib init.
Properly package jar files in content shell.

BUG=
TEST=


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@136219 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-05-10 01:50:47 +00:00
wangxianzhu@chromium.org 8a16b30210 Let android_gyp pass extra parameters to gyp
This is useful for example
android_gyp --help
or
android_gyp --format=dump_dependency_json (to generate a dependency graph).

BUG=none
TEST=Run android_gyp --help


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@135746 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-05-07 22:33:19 +00:00
james.wei@intel.com 3bb4660eb6 This patch is to enable x86 android build.
patch includes two parts:
1. gyp files modification to include x86 android build.
2. add android config files for yasm which is copied from linux ones. enable android x86 build

This patch is cloned from the issue #10198027 for ownership issue. 
https://chromiumcodereview.appspot.com/10198027/

BUG=125160
TEST=


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=135087

Review URL: http://codereview.chromium.org/10271039

git-svn-id: http://src.chromium.org/svn/trunk/src/build@135110 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-05-03 09:17:45 +00:00
rsleevi@chromium.org 757089c2e1 Revert 135087 - This patch is to enable x86 android build.
patch includes two parts:
1. gyp files modification to include x86 android build.
2. add android config files for yasm which is copied from linux ones. enable android x86 build

This patch is cloned from the issue #10198027 for ownership issue. 
https://chromiumcodereview.appspot.com/10198027/

BUG=125160
TEST=


Review URL: http://codereview.chromium.org/10271039

TBR=james.wei@intel.com
Review URL: https://chromiumcodereview.appspot.com/10331008

git-svn-id: http://src.chromium.org/svn/trunk/src/build@135095 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-05-03 05:03:14 +00:00
james.wei@intel.com f686c213c2 This patch is to enable x86 android build.
patch includes two parts:
1. gyp files modification to include x86 android build.
2. add android config files for yasm which is copied from linux ones. enable android x86 build

This patch is cloned from the issue #10198027 for ownership issue. 
https://chromiumcodereview.appspot.com/10198027/

BUG=125160
TEST=


Review URL: http://codereview.chromium.org/10271039

git-svn-id: http://src.chromium.org/svn/trunk/src/build@135087 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-05-03 04:00:39 +00:00
jrg@chromium.org a6747feb99 Package and load native library in content shell. Add content shell util scripts.
BUG=None
TEST=


Review URL: http://codereview.chromium.org/10223007

git-svn-id: http://src.chromium.org/svn/trunk/src/build@134030 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-04-26 00:48:41 +00:00
jrg@chromium.org 5354603cad apk-based test runner work for android. 2 unit test bundles converted over (ipc, base).
OFF by default; enable with a gyp var.  E.g.
  GYP_DEFINES="$GYP_DEFINES gtest_target_type=shared_library" android_gyp

Some useful commands:
adb uninstall org.chromium.native_test
adb install -r out/Release/base_unittests_apk/ChromeNativeTests-debug.apk
adb shell am start -n org.chromium.native_test/org.chromium.native_test.ChromeNativeTestActivity

For the moment, all apks can be built simultaneously but use the same
activity name.  Thus you cannot have more than one installed at the
same time.

BUG=None
TEST=


Review URL: http://codereview.chromium.org/10051021

git-svn-id: http://src.chromium.org/svn/trunk/src/build@133053 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-04-19 21:02:09 +00:00
rsleevi@chromium.org 962d5c4564 Revert 128679 - Speculative revert. xcodebuilders hosed between r128678 - 128680 in GYP phse, this is the only change that touched GYP files.
apk-based test runner work.  Not enabled yet.  This CL is a combination of upstreaming, ndk/ant-ification, and other tweaks.


BUG=None
TEST=


Review URL: http://codereview.chromium.org/9834037

TBR=jrg@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9852004

git-svn-id: http://src.chromium.org/svn/trunk/src/build@128685 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-03-24 04:44:41 +00:00
jrg@chromium.org d168ae37cd apk-based test runner work. Not enabled yet. This CL is a combination of upstreaming, ndk/ant-ification, and other tweaks.
BUG=None
TEST=


Review URL: http://codereview.chromium.org/9834037

git-svn-id: http://src.chromium.org/svn/trunk/src/build@128679 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-03-24 03:57:36 +00:00
bulach@chromium.org f0219b05fd Chrome on Android: fix cross-compilation setup.
This patch removes the need of exporting / setting
CROSS_C* variables when calling make for android.
Instead, set them at Makefile generation time so that gyp will
set the right compilers when calling android_gyp.
This also allows goma builds.

BUG=
TEST=builds for android.


Review URL: http://codereview.chromium.org/9693042

git-svn-id: http://src.chromium.org/svn/trunk/src/build@127667 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-03-20 10:45:27 +00:00
peter@chromium.org 08bcd48b81 Upstream Android's PathUtils implementation.
BUG=
TEST=


Review URL: http://codereview.chromium.org/9443018

git-svn-id: http://src.chromium.org/svn/trunk/src/build@126624 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-03-14 11:24:04 +00:00
navabi@google.com 4973b55eb9 Add install script for ant/java for Android and rename sdk install script.
As we upstream Java source code, the upstream bots and developers need to hava
java and ant.  Ant is used to build the java source code.  Installing ant/java
requires sudo privileges which installation of sdk/ndk does not require.  The
patch moves the install script for sdk/ndk to install-build-deps-android-sdk.sh.
The new install script for ant/java is called install-ubild-deps-android.sh and
will prompt the user for sudo password.

BUG=http://code.google.com/p/chromium/issues/detail?id=117023
TEST=


Review URL: http://codereview.chromium.org/9605020

git-svn-id: http://src.chromium.org/svn/trunk/src/build@125297 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-03-07 02:22:18 +00:00
jrg@chromium.org 9e9f9540f8 Use goma for android builds.
BUG=None
TEST=

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@124565 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-03-02 01:30:42 +00:00
wangxianzhu@chromium.org 8161bd6d41 Use 'readlink -f .' instead of 'pwd' when setting CHROME_SRC
Some python script (e.g. tools/grit/grit/node/misc.py) assumes that there is no
symblic link in the path of CHROME_SRC.

BUG=
TEST=


Review URL: http://codereview.chromium.org/9350052

git-svn-id: http://src.chromium.org/svn/trunk/src/build@121788 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-14 00:41:55 +00:00
peter@chromium.org 051ba405f6 Always enable the ARMv7 architecture for Android builds
BUG=
TEST=


Review URL: http://codereview.chromium.org/9111018

git-svn-id: http://src.chromium.org/svn/trunk/src/build@116662 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-01-06 13:10:07 +00:00
jrg@chromium.org 845656eb55 Android 'all' (and All) changes.
BUG=
TEST=


Review URL: http://codereview.chromium.org/8677021

git-svn-id: http://src.chromium.org/svn/trunk/src/build@111802 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2011-11-28 23:07:53 +00:00
peter@chromium.org 8f639a149b Ensure that WebKit can use envsetup.sh
Right now Android's envsetup.sh requires the chdir to be in Chromium's
src directory, whereas this will be different for WebKit. Furthermore,
disabling build_ffmpegsumo will resolve a gyp error in ffmpeg.gyp.

BUG=
TEST=

Review URL: http://codereview.chromium.org/8523029

git-svn-id: http://src.chromium.org/svn/trunk/src/build@110697 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2011-11-18 13:57:48 +00:00
michaelbai@google.com 91f7bc60fe Add Android SDK to system path
As the requirement of third_party/android/testrunner, the Android SDK needs in the system path.

BUG=
TEST=

Review URL: http://codereview.chromium.org/8380026

git-svn-id: http://src.chromium.org/svn/trunk/src/build@107130 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2011-10-25 16:12:24 +00:00
michaelbai@google.com 695c3263b9 Upstream: Set build target and evnvironment for Android
BUG=
TEST=

Review URL: http://codereview.chromium.org/8008026

git-svn-id: http://src.chromium.org/svn/trunk/src/build@102807 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2011-09-26 21:40:38 +00:00