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
2652c74f23
Make java.gypi export jar path to input_jars_paths variable
...
Both java.gypi and apk_test.gypi expect the jar path in
input_jars_paths. This means that we were specifying the dependence in
both 'dependencies' and 'input_jars_paths'. This change makes it so that
we don't need that redundancy.
Also, make java.gypi use input_jars_paths in its input so that we
actually rebuild targets when we should.
BUG=136756
Review URL: https://chromiumcodereview.appspot.com/10837143
git-svn-id: http://src.chromium.org/svn/trunk/src/build@150850 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-09 18:08:19 +00:00
8607b7b7a0
Build target for Android WebView.
...
This creates a "libwebview" build target for the JNI code to power the
Android WebView. This is unfinished and can't run without additional
code that has not yet been upstreamed, but it compiles and links
successfully.
In its present state the WebViewMainDelegate reuses Chrome
implementations of other content client interfaces. This is a temporary
state of affairs until necessary refactorings can be performed.
Review URL: https://chromiumcodereview.appspot.com/10825155
git-svn-id: http://src.chromium.org/svn/trunk/src/build@150780 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-09 10:55:04 +00:00
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
ed7778f74d
Built crypto and crypto_unittests for iOS
...
Adds iOS support to crypto.gyp. Both targets now build, but the tests may not
run correctly, and not all the crypto code is correct yet for iOS.
BUG=NONE
Review URL: https://chromiumcodereview.appspot.com/10830183
git-svn-id: http://src.chromium.org/svn/trunk/src/build@150775 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-09 10:24:54 +00:00
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
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
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
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
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
aeb12e6ad4
Remove deprecated aura_shell_unittests target
...
This target has been renamed to ash_unittests. We were
temporarily building ash_unittests and copying it to
aura_shell_unittests. The buildbots have been reconfigured
and restarted, so they should look for the new name. We
can now eliminate the copy step and the old target.
BUG=110107
TEST=green buildbots
Review URL: https://chromiumcodereview.appspot.com/10828075
git-svn-id: http://src.chromium.org/svn/trunk/src/build@150578 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-08 17:27:19 +00:00
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
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
4c2374195b
A nonsense change to test that the commit queue doesn't update the copyright
...
notice's year.
Review URL: https://chromiumcodereview.appspot.com/10825231
git-svn-id: http://src.chromium.org/svn/trunk/src/build@150452 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-07 23:48:28 +00:00
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
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
5341ab9eac
Add build/ios/mac_build.gypi for building Mac components used by iOS build
...
The mac_build.gypi is used to build Mac targets via ninja. The template runs gyp_chromium to generate a ninja project file, then gyp target that includes the template should include an action to run ninja for the desired targets.
BUG=None
Review URL: https://chromiumcodereview.appspot.com/10826169
git-svn-id: http://src.chromium.org/svn/trunk/src/build@150357 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-07 16:06:34 +00:00
b0492632b3
Android: configure use_system_zlib in zlib.gyp
...
Currently third_party/zlib/zlib.gyp uses the system libz if:
os_posix == 1 and OS != "mac" and OS != "ios" and OS != "openbsd"
I'm assuming that Android sets os_posix==1 and therefore this change is
a no-op. But it consolidates control of this variable in a single
location.
BUG=none
https://chromiumcodereview.appspot.com/10837100/
git-svn-id: http://src.chromium.org/svn/trunk/src/build@150355 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-07 15:56:00 +00:00
6443086c0f
Also detect the CXX_target enviroment vairiable for compiler version
...
The ninja's cross compile mode still uses CXX_target as the target compiler
which needs to be detected before the host one.
This CL might be reverted once the ninja use CXX as target compiler.
BUG=
Review URL: https://chromiumcodereview.appspot.com/10837005
git-svn-id: http://src.chromium.org/svn/trunk/src/build@150300 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-07 07:46:52 +00:00
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
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
1b1371ada4
Upstream Android-specific strings.
...
BUG=136951
Review URL: https://chromiumcodereview.appspot.com/10824121
git-svn-id: http://src.chromium.org/svn/trunk/src/build@150217 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-07 01:23:11 +00:00
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
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
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
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
5109c33f42
Remove supalink
...
No longer required with 2010 builds, and not required (and doesn't-work-with)
ninja on 2008.
Deleted references to supalink here:
http://code.google.com/p/chromium/wiki/WindowsIncrementalLinking
R=thakis@chromium.orgo
BUG=140611
Review URL: https://chromiumcodereview.appspot.com/10832161
git-svn-id: http://src.chromium.org/svn/trunk/src/build@150151 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-06 21:49:26 +00:00
96d1d29b2f
Revert 149892 - Remove cygwin disease from grit (python) invocations :)
...
(Try bots currently failing on pak build. Not sure that this is the cause, but
I don't see a lot of other plausible candidates. I'll revert this revert if it
doesn't help.)
R=scottmg,joi
BUG=123026
Review URL: https://chromiumcodereview.appspot.com/10832121
TBR=iannucci@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10834182
git-svn-id: http://src.chromium.org/svn/trunk/src/build@150118 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-06 18:31:33 +00:00
57374eacf4
Change all to build gles2_conform_test
...
BUG=83382
Review URL: https://chromiumcodereview.appspot.com/10826153
git-svn-id: http://src.chromium.org/svn/trunk/src/build@150033 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-05 00:29:52 +00:00
553710b04e
Remove cygwin disease from grit (python) invocations :)
...
R=scottmg,joi
BUG=123026
Review URL: https://chromiumcodereview.appspot.com/10832121
git-svn-id: http://src.chromium.org/svn/trunk/src/build@149892 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-03 19:41:51 +00:00
5432223bdb
Rewrite script to add gdb index to binary files
...
This is a clean rewrite of ajwong@'s add-gdb-index script.
BUG=NONE
Review URL: https://chromiumcodereview.appspot.com/10843037
git-svn-id: http://src.chromium.org/svn/trunk/src/build@149791 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-03 02:56:36 +00:00
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
fa04e4f051
Use early expansion for debug_optimize and release_optimize
...
BUG=139118
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10828084
git-svn-id: http://src.chromium.org/svn/trunk/src/build@149677 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-02 19:41:18 +00:00
263381e1b6
Upstreaming AndroidProtocolAdapter.
...
We currently don't have a way of compiling or running java unittests upstream.
So the java unittest for AndroidProtocolAdapter is being done only downstream for now.
It should be upstreamed once we can.
BUG=136983
TEST=
Review URL: https://chromiumcodereview.appspot.com/10832034
git-svn-id: http://src.chromium.org/svn/trunk/src/build@149653 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-02 18:04:49 +00:00
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
44f243175d
Remove gfx_unittests target in favor of ui_unittests
...
Removes the gfx_unittests target from various .gyp files in favor of
ui_unittests. This can be landed once the master builders are restarted with
the change: https://chromiumcodereview.appspot.com/10778013
TEST=None
BUG=133864
R=tony@chromium.org , hbono@chromium.org , petermayo@chromium.org
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10778019
git-svn-id: http://src.chromium.org/svn/trunk/src/build@149633 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-02 15:47:22 +00:00
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
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
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
66d409799f
Introduce the --sdk-build flag for Android's native test generator
...
This flag supersedes --ant-compile and takes its value from gyp's sdk_build
variable. It will tell the native test generator script to use Ant for Java
compilation (default) instead of the Android.mk file.
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10821128
git-svn-id: http://src.chromium.org/svn/trunk/src/build@149440 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-01 17:39:24 +00:00
a94a4ef10d
Initial iOS bring up of ui.
...
A very bare minimum: only point, rect and size are compiled and no unittest support yet.
BUG=None
Review URL: https://chromiumcodereview.appspot.com/10837041
git-svn-id: http://src.chromium.org/svn/trunk/src/build@149435 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-01 17:27:32 +00:00
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
266ef28ac0
Android: remove ant environment dependencies.
...
The logic to calculate where the SDK should be is already done by
envsetup and made available to gyp as a variable, so just have gyp pass
this as a command line argument to ant. The behaviour is identical.
This change is to move toward making it possible to build the Android
port without having envsetup.sh sourced at build time (only at
gyp-generation time), making it more like other platforms. It also
simplifies the ant buildfiles.
Review URL: https://chromiumcodereview.appspot.com/10821105
git-svn-id: http://src.chromium.org/svn/trunk/src/build@149400 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-01 11:31:47 +00:00
1366bc0afe
Bump DEPS and use new download_toolchains.py in NaCl Repo.
...
Remove hashes from DEPS file and instead use the ones specified in the NaCl
repo for the version of NativeClient specified in the DEPS file.
BUG=http://code.google.com/p/chromium/issues/detail?id=138285
TBR= bradnelson@google.com
Review URL: https://chromiumcodereview.appspot.com/10821118
git-svn-id: http://src.chromium.org/svn/trunk/src/build@149360 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-01 02:35:49 +00:00
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
cd00a05aa5
Pass enable_themes to grit and use for html conditions regarding themes.
...
BUG=139369
TEST=None
Review URL: https://chromiumcodereview.appspot.com/10839003
git-svn-id: http://src.chromium.org/svn/trunk/src/build@149269 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-31 20:40:33 +00:00
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
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
bbffe40b89
Change the Mac OS X Deployment Target from 10.5 to 10.6.
...
BUG=137676
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10816040
git-svn-id: http://src.chromium.org/svn/trunk/src/build@149198 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-31 16:24:57 +00:00
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
navabi@chromium.org
cjhopman@chromium.org
torne@chromium.org
eugenis@chromium.org
msarda@chromium.org
yongsheng.zhu@intel.com
nileshagrawal@chromium.org
ilevy@chromium.org
jamescook@chromium.org
flackr@chromium.org
mark@chromium.org
lliabraa@chromium.org
agl@chromium.org
michaelbai@chromium.org
newt@chromium.org
yfriedman@chromium.org
scottmg@chromium.org
scottmg@google.com
gman@chromium.org
iannucci@chromium.org
vrk@chromium.org
bulach@chromium.org
thestig@chromium.org
felipeg@chromium.org
dhollowa@chromium.org
peter@chromium.org
noyau@chromium.org
noelallen@chromium.org
navabi@google.com
shouqun.liu@intel.com
rsesek@chromium.org