-
Eric Karl authored
This reverts commit 797ebfdc. Reason for revert: Fixed minor build issue causing initial revert. Original change's description: > Revert "Cleanup Android video targets" > > This reverts commit 9c44fedd. > > Reason for revert: broke https://ci.chromium.org/p/chromium/builders/ci/android-jumbo-rel/13515 > > Original change's description: > > Cleanup Android video targets > > > > Fixes WebView component build issues. > > > > Previous CLs introduced a number of new targets including > > texture_owner_android and shared_image_video. These were causing build > > problems due to duplicate file compilation which led to DCHECKs. > > > > Moved most of these files into gpu/command_buffer/service:gles2, as > > they all depended on this target (so no new transitive deps), and it's > > probably a good place for them for now and simplifies dependency > > management. > > > > Bug: 996285 > > Change-Id: Ic5a9cced7e67500cfd5fff8809d4ee5e17bbab8b > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1787165 > > Reviewed-by: Frank Liberato <liberato@chromium.org> > > Reviewed-by: Nasko Oskov <nasko@chromium.org> > > Reviewed-by: vikas soni <vikassoni@chromium.org> > > Auto-Submit: Eric Karl <ericrk@chromium.org> > > Commit-Queue: Eric Karl <ericrk@chromium.org> > > Cr-Commit-Position: refs/heads/master@{#695006} > > TBR=kinuko@chromium.org,nasko@chromium.org,liberato@chromium.org,ericrk@chromium.org,vikassoni@chromium.org > > Change-Id: Ib51ec09046ecfa51543836755b6b830d76fbce94 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: 996285 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1793931 > Reviewed-by: Tao Bai <michaelbai@chromium.org> > Commit-Queue: Tao Bai <michaelbai@chromium.org> > Cr-Commit-Position: refs/heads/master@{#695062} TBR=michaelbai@chromium.org,kinuko@chromium.org,nasko@chromium.org,liberato@chromium.org,ericrk@chromium.org,vikassoni@chromium.org Change-Id: I35661eb7691dbbacb063e308513daca68efcff75 Bug: 996285 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1796110Reviewed-by:
vikas soni <vikassoni@chromium.org> Reviewed-by:
Tao Bai <michaelbai@chromium.org> Reviewed-by:
Frank Liberato <liberato@chromium.org> Reviewed-by:
Eric Karl <ericrk@chromium.org> Commit-Queue: Eric Karl <ericrk@chromium.org> Cr-Commit-Position: refs/heads/master@{#695260}
0ec49506