GitLab

Reason for revert:
Suspected for android compile failure on waterfall starting

http://build.chromium.org/p/chromium/builders/Android/builds/24321

Errors are pretty obscure. Things like

BUILD FAILED
/b/build/slave/Android/build/src/build/android/ant/apk-obfuscate.xml:161: /b/build/slave/Android/build/src/out/Release/multiple_proguards_test_apk/proguard.txt (No such file or directory)
	at proguard.ant.ConfigurationTask.addText(ConfigurationTask.java:315)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)

FAILED: cd ../../build/android/tests/multiple_proguards; /*snip*/ build/android/ant/apk-obfuscate.xml
Traceback (most recent call last):
  File "../../../../build/android/gyp/ant.py", line 34, in main
    stdout = build_utils.CheckOutput(['ant'] + verbose_args)
  File "/b/build/slave/Android/build/src/build/android/gyp/util/build_utils.py", line 113, in CheckOutput
    raise CalledProcessError(cwd, args, stdout + stderr)

Original issue's description:
> Remove apk-codegen.xml
> 
> process_resources.py already implements almost everything from 
> apk-codegen.xml so just use that instead.
> 
> BUG=359249,375324,375431
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=272783

TBR=yfriedman@chromium.org,cjhopman@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=359249,375324,375431

Review URL: https://codereview.chromium.org/301543002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272795 0039d316-1c4b-4281-b951-d872f2087c98