Build changes for updating Android SDK to 4.3.

Some of the build tools have moved in the SDK (e.g. aapt, aidl) from
sdk/platform-tools/ to sdk/build-tools/<tools-version>/. The tools version is 18.0.1.

BUG=263966
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=216612

[navabi, 2013-08-02 21:59:50]

On 2013/08/02 21:38:02, navabi wrote:

Not ready for review. Still to do;
  - I made sure this builds locally. Need to run local tests
  - Need to build/test webview build (adding joth for webview part)
    webview points to sdk tools in the Android build. Need to make changes so
for webview it still points to sdk/platform-tools in the Android build
    for non-webview builds those tools have moved to sdk/build-tools/18.0.1/,
which is gyp var android_sdk_build_tools

[Andrew Hayden (chromium.org), 2013-08-05 09:49:14]

LGTM with only a little bit of textual cleanup.

https://codereview.chromium.org/21977003/diff/1/build/android/gyp/dex.py
File build/android/gyp/dex.py (right):

https://codereview.chromium.org/21977003/diff/1/build/android/gyp/dex.py#newc...
build/android/gyp/dex.py:34: help='Android sdk build tools.')
Perhaps (to match what is above):
Android sdk build tools directory.

We should probably also add a note explaining why the sdk build tools directory
cannot be derived from the sdk-root.

https://codereview.chromium.org/21977003/diff/1/build/android/gyp/process_res...
File build/android/gyp/process_resources.py (right):

https://codereview.chromium.org/21977003/diff/1/build/android/gyp/process_res...
build/android/gyp/process_resources.py:24: help='path to the Android SDK
platform tools folder')
this is now the build tools folder, right? s/platform/build/

[Isaac (away), 2013-08-05 10:32:46]

+cjhopman

[Isaac (away), 2013-08-05 10:33:40]

Also: won't you need to roll android as part of this change?

[navabi, 2013-08-05 16:34:32]

Isaac, I will need to roll the Android SDK along with this change (not as
part of it since it is in a different repo, i.e.
third_party/android_tools). I need this change to be ready to land.
Is that what you are talking about? If not, please be more specific.


On Mon, Aug 5, 2013 at 3:33 AM, <ilevy@chromium.org> wrote:

> Also: won't you need to roll android as part of this change?
>
>
https://codereview.chromium.**org/21977003/<https://codereview.chromium.org/2...
>

[Isaac (away), 2013-08-06 09:48:25]

I am referring to the revision in src/DEPS.

[navabi, 2013-08-06 17:35:23]

On 2013/08/06 09:48:25, Isaac wrote:
> I am referring to the revision in src/DEPS.

Ah. Yes. That will need to change. I've haven't yet pushed the new android_tools
so I don't have the new revision yet.
I'm currently making sure all the tests pass with the build changes related to
the new SDK.
Once I have verified tests pass locally, I'll push the new android_tools and
update the revision accordingly in src/DEPS, and upload a new patch.

[Yaron, 2013-08-06 20:16:26]

yfriedman->cjhopman

[navabi, 2013-08-06 23:07:33]

PTAL. The nits have been addressed. The new SDK has been pushed to android_tools
(https://gerrit.chromium.org/gerrit/#/c/64845/), and src/DEPS has been changed
to roll android_tools to the new revision.

Locally verified instrumentation tests and unit tests for debug/release, and
tested locally for webview.

https://codereview.chromium.org/21977003/diff/1/build/android/gyp/dex.py
File build/android/gyp/dex.py (right):

https://codereview.chromium.org/21977003/diff/1/build/android/gyp/dex.py#newc...
build/android/gyp/dex.py:34: help='Android sdk build tools.')
On 2013/08/05 09:49:14, Andrew Hayden wrote:
> Perhaps (to match what is above):
> Android sdk build tools directory.
> 
> We should probably also add a note explaining why the sdk build tools
directory
> cannot be derived from the sdk-root.

Done.

https://codereview.chromium.org/21977003/diff/1/build/android/gyp/process_res...
File build/android/gyp/process_resources.py (right):

https://codereview.chromium.org/21977003/diff/1/build/android/gyp/process_res...
build/android/gyp/process_resources.py:24: help='path to the Android SDK
platform tools folder')
On 2013/08/05 09:49:14, Andrew Hayden wrote:
> this is now the build tools folder, right? s/platform/build/

Yes. Good catch. Done.

[cjhopman, 2013-08-07 18:14:25]

lgtm with a couple nits

https://chromiumcodereview.appspot.com/21977003/diff/15002/build/android/gyp/...
File build/android/gyp/dex.py (right):

https://chromiumcodereview.appspot.com/21977003/diff/15002/build/android/gyp/...
build/android/gyp/dex.py:32: parser.add_option('--android-sdk-root',
help='Android sdk root directory.')
This isn't used anymore.

https://chromiumcodereview.appspot.com/21977003/diff/15002/build/common.gypi
File build/common.gypi (right):

https://chromiumcodereview.appspot.com/21977003/diff/15002/build/common.gypi#...
build/common.gypi:1220: # Android build-tools version
Remove tabs.

[navabi, 2013-08-07 18:24:12]

Thanks Chris.

https://codereview.chromium.org/21977003/diff/15002/build/android/gyp/dex.py
File build/android/gyp/dex.py (right):

https://codereview.chromium.org/21977003/diff/15002/build/android/gyp/dex.py#...
build/android/gyp/dex.py:32: parser.add_option('--android-sdk-root',
help='Android sdk root directory.')
On 2013/08/07 18:14:25, cjhopman wrote:
> This isn't used anymore.

Removed. Along with all instances of calls to dex.py:
build/android/dex_action.gypi
build/java_prebuilt.gypi
build/uiautomator_test.gypi

https://codereview.chromium.org/21977003/diff/15002/build/common.gypi
File build/common.gypi (right):

https://codereview.chromium.org/21977003/diff/15002/build/common.gypi#newcode...
build/common.gypi:1220: # Android build-tools version
On 2013/08/07 18:14:25, cjhopman wrote:
> Remove tabs.

Done.

[commit-bot: I haz the power, 2013-08-07 18:26:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/navabi@google.com/21977003/27001

[commit-bot: I haz the power, 2013-08-07 18:53:19]

Sorry for I got bad news for ya.
Compile failed with a clobber build on android_aosp.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_ao...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-08-08 01:31:13]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/navabi@google.com/21977003/45001

[commit-bot: I haz the power, 2013-08-08 15:59:25]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/navabi@google.com/21977003/45001

[commit-bot: I haz the power, 2013-08-08 20:04:53]

Step "update" is always a major failure.
Look at the try server FAQ for more details.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_db...

[commit-bot: I haz the power, 2013-08-09 00:48:22]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/navabi@google.com/21977003/67002

[commit-bot: I haz the power, 2013-08-09 06:48:23]

Change committed as 216612