summaryrefslogtreecommitdiffstats
path: root/ui/snapshot
diff options
context:
space:
mode:
authormfomitchev <mfomitchev@chromium.org>2015-10-15 16:51:08 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-15 23:52:30 +0000
commit17103c5d3352ef91364e2da122374ab229299fd3 (patch)
tree28a7100c7cce7a0832f0b3669ff1aa26047ce233 /ui/snapshot
parentfbea98ab539cdf189d3d1166417939dcd8bbd5f0 (diff)
downloadchromium_src-17103c5d3352ef91364e2da122374ab229299fd3.zip
chromium_src-17103c5d3352ef91364e2da122374ab229299fd3.tar.gz
chromium_src-17103c5d3352ef91364e2da122374ab229299fd3.tar.bz2
Aura on Android: Use Aura's snapshot implementaion with Android Aura.
BUG=507792 Review URL: https://codereview.chromium.org/1410523003 Cr-Commit-Position: refs/heads/master@{#354407}
Diffstat (limited to 'ui/snapshot')
-rw-r--r--ui/snapshot/BUILD.gn6
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/snapshot/BUILD.gn b/ui/snapshot/BUILD.gn
index a9e5b0b..c79a70b 100644
--- a/ui/snapshot/BUILD.gn
+++ b/ui/snapshot/BUILD.gn
@@ -30,7 +30,7 @@ component("snapshot") {
"//ui/gfx/geometry",
]
- if (is_android) {
+ if (is_android && !use_aura) {
deps += [ "//ui/android" ]
}
@@ -46,6 +46,10 @@ component("snapshot") {
]
}
+ if (is_android && use_aura) {
+ sources -= [ "snapshot_android.cc" ]
+ }
+
if (use_aura) {
deps += [
"//ui/aura",