Bug 92931

Created attachment 155946 [details] Patch

These are backwards compatible but add a few variable definitions so that ant builds will work after http://codereview.chromium.org/10830012/. I've tested inside my chromium tree before and after the change.

As an aside: it seems like these rules would benefit from using build/apk_test.gypi as it would save a bunch of boilerplate. I'm guessing they aren't typically used in webkit?

Comment on attachment 155946 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=155946&action=review While this SGTM after the ChangeLog updates, it'll cause a build failure right now because the android_sdk_* variables are not yet available. You'll need to split your patch in three parts.. First land the envsetup_function.sh changes which introduce the variables, then roll Chromium into WebKit, then update WebKit with these changes, then roll WebKit into Chromium, then land the rest of your patch. Lovely, innit? If you land the variables on the Chromium side and update your patch here, I'll make sure that anything up to rolling WebKit into Chromium is done before you come in tomorrow. You'll be able to pick it up after that. As an aside, I think it's fine for WebKit to use gypi files in build/ (after all, we already use common.gypi too), but we can do that in a later patch, as this blocks your's on the Chromium side. > Source/WebKit/chromium/ChangeLog:8 > + Additional information of the change such as approach, rationale. Please add per-function descriptions below (OOPS!). Please add a brief description of what's changing. Something among the lines of "Pass Android-specific gyp variables to the native test generator, avoiding any dependencies on environment variables during build time." would be perfect. > Tools/ChangeLog:8 > + Additional information of the change such as approach, rationale. Please add per-function descriptions below (OOPS!). dito.

Created attachment 156090 [details] Patch

Attachment 156090 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/chromium/ChangeLog', u'Sourc..." exit_code: 1 Source/WebKit/chromium/ChangeLog:9: Line contains tab character. [whitespace/tab] [5] Tools/ChangeLog:9: Line contains tab character. [whitespace/tab] [5] Total errors found: 2 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style.

Created attachment 156092 [details] Patch

Ok. Looks like chromium LKGR is passed my revision. Can we roll chromium into webkit now? Do I just join #webkit and ask sheriffbot (http://www.chromium.org/developers/how-tos/webkit-gardening)

> Can we roll chromium into webkit now? Yes. > Do I just join #webkit and ask sheriffbot (http://www.chromium.org/developers/how-tos/webkit-gardening) Yep! You say something like: sheriffbot: roll-chromium-deps NNNNN

Ok, roll is in. Can we land this guy?

Comment on attachment 156092 [details] Patch Fine with me as long as Peter says it's ok.

Comment on attachment 156092 [details] Patch Clearing flags on attachment: 156092 Committed r124676: <http://trac.webkit.org/changeset/124676>

All reviewed patches have been landed. Closing bug.