Update Android build to API level 17 and SDK Tools version 21

Update Android build to API level 17 and SDK Tools version 21

Some fixes included:
- Changes to resource management to account for new R.java packaging
  from library projects
  (https://android-review.googlesource.com/#/c/43134/).
- Fixed the package for some inludes in ModalDialogTest.java. This only
  worked because of how we previously used to aggregate all resoures
  from the prior layer. With the new packaging, we must use the resource
  from the appropriate layer.

BUG=163001, 166434
NOTRY=true

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

[Yaron, 2013-01-10 02:48:46]

joth: android_webview
cjhopman/newt: rest

klobag/bulach as FYI (I can also send a psa when it lands)

[joth, 2013-01-10 02:58:17]

aw/ lgtm

https://codereview.chromium.org/11819047/diff/5001/android_webview/javatests/...
File android_webview/javatests/AndroidManifest.xml (right):

https://codereview.chromium.org/11819047/diff/5001/android_webview/javatests/...
android_webview/javatests/AndroidManifest.xml:14: </application>
oh if you do spin another patchset, while here could you add a TODO to move min
SDK to 16 when crbug 161864 is closed. thx

[newt (away), 2013-01-10 17:34:35]

Have you checked if this CL builds correctly even without wiping the out
directory?  I think it should, as far as resources are concerned:
process_resources.py has changed, so  the process_resources gyp step should be
re-run and new R.java and R.txt files should be generated.

Otherwise LGTM

[cjhopman, 2013-01-10 18:50:29]

https://codereview.chromium.org/11819047/diff/5001/build/java_apk.gypi
File build/java_apk.gypi (right):

https://codereview.chromium.org/11819047/diff/5001/build/java_apk.gypi#newcod...
build/java_apk.gypi:168: '-DADDITIONAL_R_FILES=>(additional_R_text_files)',
There is a gyp variable <(additional_R_files) and so the mismatch here looks
wrong. Can you change it to:
-DADDITIONAL_R_TEXT_FILES=>(additional_R_text_files)
and then the corresponding ant change.

[Yaron, 2013-01-10 18:51:42]

I noticed one inconsistency I had with additional_r_files and
additional_r_text_files so I corrected that and also removed one spurious log.
Verified all downstream tests pass too. CQing

https://codereview.chromium.org/11819047/diff/5001/android_webview/javatests/...
File android_webview/javatests/AndroidManifest.xml (right):

https://codereview.chromium.org/11819047/diff/5001/android_webview/javatests/...
android_webview/javatests/AndroidManifest.xml:14: </application>
On 2013/01/10 02:58:17, joth wrote:
> oh if you do spin another patchset, while here could you add a TODO to move
min
> SDK to 16 when crbug 161864 is closed. thx 

Done.

[Yaron, 2013-01-10 18:52:58]

On 2013/01/10 18:51:42, Yaron wrote:
> I noticed one inconsistency I had with additional_r_files and
> additional_r_text_files so I corrected that and also removed one spurious log.
> Verified all downstream tests pass too. CQing
> 
>
https://codereview.chromium.org/11819047/diff/5001/android_webview/javatests/...
> File android_webview/javatests/AndroidManifest.xml (right):
> 
>
https://codereview.chromium.org/11819047/diff/5001/android_webview/javatests/...
> android_webview/javatests/AndroidManifest.xml:14: </application>
> On 2013/01/10 02:58:17, joth wrote:
> > oh if you do spin another patchset, while here could you add a TODO to move
> min
> > SDK to 16 when crbug 161864 is closed. thx 
> 
> Done.

Wow, I literally just fixed that!

Also verified newt's test case. You need to re-run envsetup android android_gyp
after syncing but it works in place.

[cjhopman, 2013-01-10 18:53:24]

lgtm

[commit-bot: I haz the power, 2013-01-10 18:55:19]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yfriedman@chromium.org/11819047/12001

[commit-bot: I haz the power, 2013-01-10 20:43:51]

Retried try job too often on mac_rel for step(s) browser_tests

[commit-bot: I haz the power, 2013-01-10 21:16:35]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yfriedman@chromium.org/11819047/5007

[commit-bot: I haz the power, 2013-01-10 22:12:08]

Retried try job too often on win_rel for step(s) browser_tests

[commit-bot: I haz the power, 2013-01-10 22:16:32]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yfriedman@chromium.org/11819047/5007

[commit-bot: I haz the power, 2013-01-10 22:27:18]

Change committed as 176176