GitLab

This reverts commit ecd51275.

Reason for revert: 
Android builds started failing after this commit. 
CalledProcessError message is related gyp:
FAILED: obj/clank/java/clank_java.turbine.jar gen/clank/java/clank_java.generated.srcjar 
/b/s/w/ir/cipd_bin_packages/cpython/bin/python ../../build/android/gyp/turbine.py --depfile=gen/clank/java/clank_java__header.d --generated-dir=gen/clank/java/clank_java/generated_java --jar-path=obj/clank/java/clank_java.turbine.jar --java-srcjars=\[\"gen/clank/java/clank_java__rjava_resources.srcjar\"\] --classpath=@FileArg\(gen/clank/java/clank_java.build_config:javac:interface_classpath\) --processorpath=@FileArg\(gen/clank/java/clank_java.build_config:javac:processor_classpath\) --processors=@FileArg\(gen/clank/java/clank_java.build_config:javac:processor_classes\) --turbine-jar-path ../../third_party/turbine/turbine.jar --generated-jar-path gen/clank/java/clank_java.generated.srcjar --java-version=1.8 --bootclasspath=@FileArg\(gen/clank/java/clank_java.build_config:android:sdk_interface_jars\) --chromium-code=1 --warnings-as-errors --jar-info-exclude-globs=\[\"\*/R.class\",\ \"\*/R\\\$\*.class\",\ \"\*/Manifest.class\",\ \"\*/Manifest\\\$\*.class\",\ \"\*/GEN_JNI.class\"\] @gen/clank/java/clank_java.sources
Traceback (most recent call last):
  File "../../build/android/gyp/turbine.py", line 176, in <module>
    sys.exit(main(sys.argv))
  File "../../build/android/gyp/turbine.py", line 172, in main
    output_paths=output_paths)
  File "/b/s/w/ir/cache/builder/src/build/android/gyp/util/md5_check.py", line 64, in CallAndWriteDepfileIfStale
    track_subpaths_allowlist=track_subpaths_allowlist)
  File "/b/s/w/ir/cache/builder/src/build/android/gyp/util/md5_check.py", line 155, in CallAndRecordIfStale
    function(*args)
  File "../../build/android/gyp/turbine.py", line 167, in <lambda>
    lambda: _OnStaleMd5(options, cmd, javac_cmd, files, options.classpath),
  File "../../build/android/gyp/turbine.py", line 51, in _OnStaleMd5
    fail_on_output=options.warnings_as_errors)
  File "/b/s/w/ir/cache/builder/src/build/android/gyp/util/build_utils.py", line 272, in CheckOutput
    raise CalledProcessError(cwd, args, stdout + stderr)



Original change's description:
> Re-enabling aar .info file checker
>
> Bug: 1143257
> Change-Id: I88d02690152aa3dabeece3d6cd937d1e3f61a1a4
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2508329
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Reviewed-by: Sam Maier <smaier@chromium.org>
> Commit-Queue: Sam Maier <smaier@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#822760}

TBR=agrieve@chromium.org,smaier@chromium.org

Change-Id: I6b1265138408f289daa72ef13c48db6669e40c74
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1143257
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2511730Reviewed-by: Wenbin Zhang <wenbinzhang@google.com>
Commit-Queue: Wenbin Zhang <wenbinzhang@google.com>
Cr-Commit-Position: refs/heads/master@{#822846}