Commit 442f3002 authored by tfarina's avatar tfarina Committed by Commit bot

Fix ui_unittests clobber issue on Android.

Nobody knows yet what the right fix should be.

So this is just a band-aid, until we figure it out.

It isn't bad as it may look like, but certainly far
from the ideal as nothing from ui/ should be
depending on things declared in chrome/.

BUG=374490
TEST=git cl try -c -r HEAD passes on Android.
R=sky@chromium.org,primiano@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#297085}
parent 4f33d27f
...@@ -56,6 +56,12 @@ ...@@ -56,6 +56,12 @@
'target_name': 'ui_unittests_apk', 'target_name': 'ui_unittests_apk',
'type': 'none', 'type': 'none',
'dependencies': [ 'dependencies': [
# TODO(tfarina): This is a layer violation and should be removed.
# crbug.com/176960
# For now this is here as a temporary band-aid to fix the clobber
# issue we are seeing when running this target on Android.
# crbug.com/374490
'../../chrome/chrome_resources.gyp:packed_resources',
'ui_unittests', 'ui_unittests',
], ],
'variables': { 'variables': {
...@@ -67,6 +73,12 @@ ...@@ -67,6 +73,12 @@
'target_name': 'ui_base_unittests_apk', 'target_name': 'ui_base_unittests_apk',
'type': 'none', 'type': 'none',
'dependencies': [ 'dependencies': [
# TODO(tfarina): This is a layer violation and should be removed.
# crbug.com/176960
# For now this is here as a temporary band-aid to fix the clobber
# issue we are seeing when running this target on Android.
# crbug.com/374490
'../../chrome/chrome_resources.gyp:packed_resources',
'ui_base_unittests', 'ui_base_unittests',
], ],
'variables': { 'variables': {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment