Android: Remove .stamp file from grit resources .zips

Came upon this by chance. The first entry in these .zip files was:

../$target_name.d.stamp

Change-Id: If540c4b67e2c74401146a98c647b88db9cd8ba0a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1980961
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Eric Stevenson <estevenson@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Eric Stevenson <estevenson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727245}

build/android/gyp/util/build_utils.py

@@ -419,6 +419,8 @@ def DoZip(inputs, output, base_dir=None, compress_fn=None,
   for tup in inputs:
     if isinstance(tup, string_types):
       tup = (os.path.relpath(tup, base_dir), tup)
+      if tup[0].startswith('..'):
+        raise Exception('Invalid zip_path: ' + tup[0])
     input_tuples.append(tup)
 
   # Sort by zip path to ensure stable zip ordering.

build/config/android/rules.gni

@@ -1227,7 +1227,9 @@ if (enable_java_templates) {
 
       # This needs to get outputs from grit's internal target, not the final
       # source_set.
-      inputs = get_target_outputs(":${_grit_target_name}_grit")
+      set_sources_assignment_filter([ "*.stamp" ])
+      sources = get_target_outputs(":${_grit_target_name}_grit")
+      inputs = sources
       output = _resources_zip
       deps = [
         ":$_grit_target_name",