The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/9af0deb4bd0d2eb6ec47063ce2a024641e0da52d

commit 9af0deb4bd0d2eb6ec47063ce2a024641e0da52d
Author: wnwen <wnwen@chromium.org>
Date: Thu Feb 02 14:16:20 2017

Android: Add owned resources to android studio

Include owned resources and unzip owned resource zips in android studio
generated gradle projects. This allows a res directory to show up for
each project.

BUG= 682846 

Review-Url: https://codereview.chromium.org/2667023002
Cr-Commit-Position: refs/heads/master@{#447764}

[modify] https://crrev.com/9af0deb4bd0d2eb6ec47063ce2a024641e0da52d/build/android/gradle/android.jinja
[modify] https://crrev.com/9af0deb4bd0d2eb6ec47063ce2a024641e0da52d/build/android/gradle/generate_gradle.py
[modify] https://crrev.com/9af0deb4bd0d2eb6ec47063ce2a024641e0da52d/docs/android_studio.md

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/11f780768683d40c8a159698c321707a299dbf1c

commit 11f780768683d40c8a159698c321707a299dbf1c
Author: agrieve <agrieve@chromium.org>
Date: Mon Feb 06 00:35:42 2017

Revert of Android: Add owned resources to android studio (patchset #3 id:40001 of https://codereview.chromium.org/2667023002/ )

Reason for revert:
Script now fails if resources aren't already built

Original issue's description:
> Android: Add owned resources to android studio
>
> Include owned resources and unzip owned resource zips in android studio
> generated gradle projects. This allows a res directory to show up for
> each project.
>
> BUG= 682846 
>
> Review-Url: https://codereview.chromium.org/2667023002
> Cr-Commit-Position: refs/heads/master@{#447764}
> Committed: https://chromium.googlesource.com/chromium/src/+/9af0deb4bd0d2eb6ec47063ce2a024641e0da52d

TBR=estevenson@chromium.org,wnwen@chromium.org
NOTRY=true
BUG= 682846 ,688219

Review-Url: https://codereview.chromium.org/2678463003
Cr-Commit-Position: refs/heads/master@{#448195}

[modify] https://crrev.com/11f780768683d40c8a159698c321707a299dbf1c/build/android/gradle/android.jinja
[modify] https://crrev.com/11f780768683d40c8a159698c321707a299dbf1c/build/android/gradle/generate_gradle.py
[modify] https://crrev.com/11f780768683d40c8a159698c321707a299dbf1c/docs/android_studio.md

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/5c3f5db756cc0aa3c9b27893a567131557a0a83c

commit 5c3f5db756cc0aa3c9b27893a567131557a0a83c
Author: wnwen <wnwen@chromium.org>
Date: Thu Feb 09 17:48:27 2017

Reland "Android: Add owned resources to android studio"

Original CL: https://codereview.chromium.org/2667023002/

Changes:
- Generalize srcjars and resource zips to be generated together.
- Update documentation

BUG= 682846 

Review-Url: https://codereview.chromium.org/2687453002
Cr-Commit-Position: refs/heads/master@{#449345}

[modify] https://crrev.com/5c3f5db756cc0aa3c9b27893a567131557a0a83c/build/android/gradle/android.jinja
[modify] https://crrev.com/5c3f5db756cc0aa3c9b27893a567131557a0a83c/build/android/gradle/generate_gradle.py
[modify] https://crrev.com/5c3f5db756cc0aa3c9b27893a567131557a0a83c/docs/android_studio.md

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/2542e2ce6ab3528312438f99808cb329e4f11ee9

commit 2542e2ce6ab3528312438f99808cb329e4f11ee9
Author: wnwen <wnwen@chromium.org>
Date: Thu Feb 09 19:34:08 2017

Revert of Reland "Android: Add owned resources to android studio" (patchset #3 id:40001 of https://codereview.chromium.org/2687453002/ )

Reason for revert:
Nonetype is not iterable.

Original issue's description:
> Reland "Android: Add owned resources to android studio"
>
> Original CL: https://codereview.chromium.org/2667023002/
>
> Changes:
> - Generalize srcjars and resource zips to be generated together.
> - Update documentation
>
> BUG= 682846 
>
> Review-Url: https://codereview.chromium.org/2687453002
> Cr-Commit-Position: refs/heads/master@{#449345}
> Committed: https://chromium.googlesource.com/chromium/src/+/5c3f5db756cc0aa3c9b27893a567131557a0a83c

TBR=estevenson@chromium.org,agrieve@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG= 682846 

Review-Url: https://codereview.chromium.org/2684843006
Cr-Commit-Position: refs/heads/master@{#449375}

[modify] https://crrev.com/2542e2ce6ab3528312438f99808cb329e4f11ee9/build/android/gradle/android.jinja
[modify] https://crrev.com/2542e2ce6ab3528312438f99808cb329e4f11ee9/build/android/gradle/generate_gradle.py
[modify] https://crrev.com/2542e2ce6ab3528312438f99808cb329e4f11ee9/docs/android_studio.md

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/0227e4a51b9dd67d5735d53aff95b8fa70a9e291

commit 0227e4a51b9dd67d5735d53aff95b8fa70a9e291
Author: wnwen <wnwen@chromium.org>
Date: Thu Feb 09 21:14:51 2017

Reland "Android: Add owned resources to android studio"

Original Reland: https://codereview.chromium.org/2687453002/

Changes:
- Fix TypeError: 'NoneType' object is not iterable

TBR=agrieve@chromium.org
BUG= 682846 

Review-Url: https://codereview.chromium.org/2680423005
Cr-Commit-Position: refs/heads/master@{#449408}

[modify] https://crrev.com/0227e4a51b9dd67d5735d53aff95b8fa70a9e291/build/android/gradle/android.jinja
[modify] https://crrev.com/0227e4a51b9dd67d5735d53aff95b8fa70a9e291/build/android/gradle/generate_gradle.py
[modify] https://crrev.com/0227e4a51b9dd67d5735d53aff95b8fa70a9e291/docs/android_studio.md

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/b4ef9a4857c32338bc7b23e30708871b7541dec0

commit b4ef9a4857c32338bc7b23e30708871b7541dec0
Author: sakal <sakal@chromium.org>
Date: Thu Feb 16 15:49:21 2017

Do not enforce unique package name in gradle projects.

This is needed because multiple targets use the default Android manifest
with package name "dummy.package". This problem occurs when letting
gradle process resources.

BUG= 682846 , webrtc:6328 

Review-Url: https://codereview.chromium.org/2699663004
Cr-Commit-Position: refs/heads/master@{#450976}

[modify] https://crrev.com/b4ef9a4857c32338bc7b23e30708871b7541dec0/build/android/gradle/android.jinja

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/cab87bffc69256f873c19f5a977d35e290a180ee

commit cab87bffc69256f873c19f5a977d35e290a180ee
Author: sakal <sakal@chromium.org>
Date: Thu Feb 16 18:52:36 2017

Generate custom manifests when letting gradle process resources.

Gradle uses package id from manifest when generating R.class. So, we
need to generate a custom manifest if we let gradle process resources.

BUG= 682846 ,  webrtc:6328 

Review-Url: https://codereview.chromium.org/2691353005
Cr-Commit-Position: refs/heads/master@{#451029}

[modify] https://crrev.com/cab87bffc69256f873c19f5a977d35e290a180ee/build/android/gradle/generate_gradle.py
[add] https://crrev.com/cab87bffc69256f873c19f5a977d35e290a180ee/build/android/gradle/manifest.jinja

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/f37993e1a795b3d8d72bb858a8ccb0a74b82400b

commit f37993e1a795b3d8d72bb858a8ccb0a74b82400b
Author: wnwen <wnwen@chromium.org>
Date: Mon Mar 13 17:36:15 2017

Android: Add missing resources to android studio

Some apk targets directly depend on their resources (e.g.
//android_webview/test:android_webview_apk). These are not picked up by
javac and need to be added to gradle in order to allow editing of all
resources.

BUG= 682846 

Review-Url: https://codereview.chromium.org/2724093003
Cr-Commit-Position: refs/heads/master@{#456416}

[modify] https://crrev.com/f37993e1a795b3d8d72bb858a8ccb0a74b82400b/build/android/gradle/generate_gradle.py
[modify] https://crrev.com/f37993e1a795b3d8d72bb858a8ccb0a74b82400b/build/android/gyp/write_build_config.py

Resources are in and can be edited. No current plans to make gradle resources work.