| Index: build/android/gyp/generate_v14_compatible_resources.py
|
| diff --git a/build/android/gyp/generate_v14_compatible_resources.py b/build/android/gyp/generate_v14_compatible_resources.py
|
| index 9e812158456a2fdafb082298083e1c032490ef91..cee06504b814ff74a6cdb5956d886794bd87eaf2 100755
|
| --- a/build/android/gyp/generate_v14_compatible_resources.py
|
| +++ b/build/android/gyp/generate_v14_compatible_resources.py
|
| @@ -267,10 +267,7 @@ def main(argv):
|
| output_qualifiers))
|
| GenerateV14StyleResourcesInDir(input_dir, output_v14_dir)
|
| else:
|
| - # TODO(kkimlabs): uncomment the below line and remove 'pass' once the
|
| - # downstream fix (https://gerrit-int.chromium.org/#/c/38786/) is landed.
|
| - # ErrorIfStyleResourceExistsInDir(input_dir)
|
| - pass
|
| + ErrorIfStyleResourceExistsInDir(input_dir)
|
|
|
| if options.stamp:
|
| build_utils.Touch(options.stamp)
|
|
|