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

248 Коммитов

Автор 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
navabi@chromium.org 64d74e0f25 Use the NDK that has been checked into android_tools.
BUG=


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@151080 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-10 17:53:06 +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
yongsheng.zhu@intel.com f476a7ba0f Fix the errors of ui unittests caused by packing colors for Android
Get the platform-independent result and compare them with the
values of SkColor which is the platform-independent ARGB format

BUG=138933
TEST=run_tests.py -s ui_unittests

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@150772 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-09 09:54:38 +00:00
nileshagrawal@chromium.org 3f2b25b1b5 Disable AutofillManagerTest.UpdatePasswordGenerationState on Android bots.
BUG=141473


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@150734 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-09 05:13:56 +00:00
ilevy@chromium.org dd098766b1 Revert "Use checked in android_tools Android NDK."
This reverts commit 7c03095b7982407cc15bb7713ebeb715599a3125.

BUG=
TEST=

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@150715 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-09 03:57:07 +00:00
navabi@chromium.org 3a80a9086b Use checked in android_tools Android NDK.
BUG=


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@150614 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-08 21:27:39 +00:00
nileshagrawal@chromium.org ebc782e2c2 Disable AutofillManagerTest.UpdatePasswordSyncState on Android bots.
BUG=141473

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@150611 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-08 21:15:33 +00:00
flackr@chromium.org d9062a2a70 Reland 150411 - "Repack separate 100 / 200 / touch_100 / touch_200 files into single pak files."
BUG=139803
TEST=Chrome runs with ui and theme resources correctly loaded.

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

TBR=sky@chromium.org

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@150570 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-08 16:43:06 +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
flackr@chromium.org 2419c92134 Revert 150411 - Repack separate 100 / 200 / touch_100 / touch_200 files into single pak files.
This broke Google Chrome Linux builders which are still looking for theme_resources_100_percent.pak.

BUG=139803
TEST=Chrome runs with ui and theme resources correctly loaded.

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

TBR=flackr@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10825234

git-svn-id: http://src.chromium.org/svn/trunk/src/build@150450 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-07 23:47:44 +00:00
flackr@chromium.org dccc5e37e9 Repack separate 100 / 200 / touch_100 / touch_200 files into single pak files.
BUG=139803
TEST=Chrome runs with ui and theme resources correctly loaded.

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@150411 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-07 21:17:38 +00:00
yongsheng.zhu@intel.com 592613f25d Fix the failed case L10nUtilTest.GetAppLocale of ui unittests on Android
There are 2 kinds of issues to make it failed:
1) pak files are stored in a different directory on Android other
than other platforms.
2) The setting and getting locale is different from Linux, but
similar with ChromiumOS.

BUG=
TEST=run_tests.py -s ui_unittests


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@150261 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-07 04:00:12 +00:00
nileshagrawal@chromium.org 17439bb032 Cleanup content unittest suppressions on Android.
These tests are not part of content_unittests

BUG=


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@150223 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-07 01:31:35 +00:00
nileshagrawal@chromium.org 2b57cdbd89 Disable SpdyCredentialBuilderTest.* on Android bots.
Failing since they were introduced.
BUG=140991

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@150188 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-07 00:25:03 +00:00
yfriedman@chromium.org 3c91146c7f [Android] Add chrome_java target for building Java code in the chromium layer.
Also includes a refactoring of the Ant xml scripts to use a common template (contributed by shashishekhar@chromium.org). As part of this, I also continued Torne's effort of removing our reliance on environment variables. Unfortunately this currently means that you have to specify 5 gyp flags:
    ANDROID_SDK, ANDROID_SDK_ROOT, ANDROID_SDK_TOOLS, ANDROID_SDK_VERSION, ANDROID_TOOLCHAIN.

This'll get better as we make further use of the checked in sdk both upstream and downstream. The problem stems from the android tree and released sdk having different configurations.

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@150172 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-06 23:23:51 +00:00
nileshagrawal@chromium.org dbedbb08aa Disable KeywordEditorControllerTest on android.
BUG=139165

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@150156 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-06 21:51:58 +00:00
nileshagrawal@chromium.org 111641a614 Disable URLRequestTestFTP on Android.
The test was added recently and in failing since.
https://chromiumcodereview.appspot.com/10844004

BUG=135165

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@150152 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-06 21:49:32 +00:00
bulach@chromium.org ec3bfe698b Android: replace temporary test runner with the instrumentation runner.
Follow up from http://codereview.chromium.org/10826071/

BUG=139365
TEST=Android FYI tester runs instrumentation tests.


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@149679 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-02 19:45:43 +00:00
yfriedman@chromium.org be423e2cf7 [Android] - Prepare apk tests for switch to checked in SDK.
http://codereview.chromium.org/10830012/ contians the final patch but
because this affects the WebKit build as well, it needs to be done in
stages. This change introduces new gyp defines that'll be needed in
WebKit.


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@149639 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-02 17:05:24 +00:00
torne@chromium.org 69b08ed5f0 Android: move various gyp defines out of envsetup.
These gyp defines are set unconditionally in envsetup, which means they
are not in fact part of the "environment" but just the defaults for the
Android build. Move them into common.gypi instead to make this clear.
Several of them were already the correct setting and can simply be
removed.

The makefiles generated by gyp are identical before and after this
change.


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@149609 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-02 11:03:58 +00:00
nileshagrawal@chromium.org 3fa35465ec Android bots: Run unit tests before running content shell tests.
BUG=

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@149552 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-02 01:09:32 +00:00
bulach@chromium.org 0aaa239737 Android: fix instrumentation step title.
Following https://chromiumcodereview.appspot.com/10832097
The step title shouldn't contain / as it confused buildbot.

BUG=139365
TEST=Multiple steps on the FYI android tester.


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@149507 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-01 22:04:52 +00:00
bulach@chromium.org 8e55e60571 Android: run instrumentation tests per "size".
Use the same concept as downstream.
This allows filtering out disabled tests.

BUG=139365
TEST=Multiple steps on the FYI android tester.


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@149434 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-01 17:17:55 +00:00
navabi@google.com 4119b2eeab Do not set ANDROID_SDK_ROOT so it uses default from android_tools.
BUG=


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@149280 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-31 21:29:15 +00:00
navabi@google.com caaa448f21 Set ANDROID_SDK_ROOT to point to checked in sdk.
BUG=


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@149258 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-31 20:03:42 +00:00
shouqun.liu@intel.com fe23de7487 Fix the PNCodec error on Android caused by different Skia color format.
Make sure the test case to compare SkPMColor between SkPMColor, rather than SkColor.

BUG=138933
TEST=ui_unittests --gtest_filter=PNGCodec.EncodeBGRASkBitmapDiscardTransparency

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@149208 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-31 17:02:17 +00:00
bulach@chromium.org 09a1a07360 Android: follow up on instrumentation tests.
Follow up from:
http://codereview.chromium.org/10826071/
Build and install content shell on all attached devices.

BUG=139365
TEST=Android FYI tester runs instrumentation tests.


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@149186 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-31 15:21:28 +00:00
bulach@chromium.org 340f2dd4ec Android: adds instrumentation tests on the FYI bot.
BUG=139365
TEST=Android FYI tester runs instrumentation tests.


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@149171 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-31 11:47:17 +00:00
nileshagrawal@chromium.org de34fa3511 Run unit_tests bundle on Android tester bots.
BUG=138115

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@148976 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-30 18:16:42 +00:00
husky@chromium.org 39f1f3b36a Fix segfault in JNIEnv function hooks for test
On newer JB builds, the JNINativeInterface struct appears to be held
in read-only memory so attempting to repoint individual function pointers
in it causes segfault. So instead we repoint the top-level struct pointer
to refer to our own copy held in read/write memory.

BUG=137348
TEST=JNIAndroidTest


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@148943 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-30 13:40:38 +00:00
nileshagrawal@chromium.org a18548bccb Add unit_tests_disabled file for android.
2732 tests pass with these suppressions.

BUG=138115

TEST=


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@148870 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-28 02:17:22 +00:00
nileshagrawal@chromium.org a9c1db5b21 Initial fixes to run unit_tests bundle on android.
BUG=138115

TEST=


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@148847 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-27 23:38:04 +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
yongsheng.zhu@intel.com 341416fb42 Add support for android in gpu test expections parser
So the parser can know 'Android' platform. Also the failed case
'GPUTestExpectationsParserTest.WebGLTestExpectationsValidation'
is passed.

BUG=118542
TEST=content_unittests


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@148719 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-27 04:08:57 +00:00
aurimas@chromium.org 8adae2ce81 Disabling failing net_unittest
Disabling UDPSocketTest.Broadcast that is failing on Android FYI bot

BUG=139144
TEST=


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@148586 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-26 18:10:52 +00:00
nileshagrawal@chromium.org 45a76f9594 Disable failing browsertest for android.
BUG=139095

TEST=

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@148521 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-26 05:56:41 +00:00
nileshagrawal@chromium.org 3580a04009 Run media_unittests on android test bots.
BUG=137131

TEST=


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@148493 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-26 02:35:57 +00:00
ilevy@chromium.org 474c6b0bca Make device_status_check run only be testers
- moving check to bb_run_tests so VM builders don't bother
  running it

R=yfriedman@chromium.org
BUG=
TEST=


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@148460 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-26 01:15:01 +00:00
ilevy@chromium.org 5c555ef5cd Add android device status check and misc cleanup
- Adding hook to print device information
- Removing some unnecessary buildbot steps

BUG=
TEST=


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@148395 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-25 20:14:15 +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
yfriedman@chromium.org eca6c4b657 Revert "Revert 147986 - [Android] Add remaining build/common.gypi changes from downstream and strip NOTIMPLEMENTED()s from official builds."
Relanding http://codereview.chromium.org/10816039/ but removing the
clang parts and fixing x86.

This reverts commit 7fc96c8b734fc9bc8152329d99e8ee3f3de14a65.

BUG=137569


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@148338 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-25 16:17:57 +00:00
benm@chromium.org e33b097640 Disable failing content_unittests on Android.
BUG=138930

TEST=content_unittests


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@148313 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-25 13:33:55 +00:00
benm@chromium.org c5bc8022ac Disable failing Android ui_unittests.
These tests are suppressed downstream, syncing those suppressions
upstream.

BUG=138933
TEST=ui_unittests


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@148310 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-25 12:51:31 +00:00
yongsheng.zhu@intel.com ea72ff8b4c Fix failed cases ImageTest.* for Android
For Android, it doesn't use views but use skia natively.

BUG=
TEST=run_tests.py -s ui_unittests


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@148287 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-25 03:01:07 +00:00
james.wei@intel.com babaafe7b5 Restarting adb server before each testing start will cause conflict for multiple emulators
Sometimes there is conflict when several tests restart adb server at the same time.
Originally, restarting adb server is to fix the issue of connection lost with adb server when emulator booting, as this case already handled in AndroidCommand::WaitForSystemBootCompleted(), so it can be removed now. 

Also fix a typo.

BUG=
TEST=./build/android/run_tests.py -e -n 5

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@148242 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-24 23:14:06 +00:00
yongsheng.zhu@intel.com a285457a38 Fix the sqlite errors of content unittests on Android
Many tests are failed due to sqlite errors on Android.
The reason is that sqlite need a temporary directory to
store internal temporary files. However, Android doesn't
have this kind of directory while Linux has /var/tmp.

To fix this, use in-memory temporary files. It also includes:
1) Add one unit test in sql unittests to reproduce this
issue for Android.
2) Remove those disabled cases for content unitests on
Android.

BUG=
TEST=run_tests.py -s sql_unittests; run_test.py -s net_unittests


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@148064 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-24 08:25:53 +00:00
yongsheng.zhu@intel.com 9425ea3ede Fix GPUTestConfigTest.LoadCurrentConfig on Android
It's a case in content unittests. Implement the config for Android.

BUG=
TEST=run_tests.py -s content_unittests


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@148040 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-24 03:38:25 +00:00