| Index: tools/android/common/BUILD.gn
|
| diff --git a/third_party/libwebm/BUILD.gn b/tools/android/common/BUILD.gn
|
| similarity index 54%
|
| copy from third_party/libwebm/BUILD.gn
|
| copy to tools/android/common/BUILD.gn
|
| index e3fd78bbd26b46fac03b3c6e66688e4c17f2efd6..dee127b5a8c75369dee519c2974bba2d1784100b 100644
|
| --- a/third_party/libwebm/BUILD.gn
|
| +++ b/tools/android/common/BUILD.gn
|
| @@ -2,15 +2,22 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| -source_set("libwebm") {
|
| +# GYP version tools/android/common.gyp:android_tools_common
|
| +source_set("common") {
|
| sources = [
|
| - "source/mkvmuxer.cpp",
|
| - "source/mkvmuxerutil.cpp",
|
| - "source/mkvwriter.cpp",
|
| + "adb_connection.cc",
|
| + "adb_connection.h",
|
| + "daemon.cc",
|
| + "daemon.h",
|
| + "net.cc",
|
| + "net.h",
|
| + ]
|
| +
|
| + include_dirs = [
|
| + "..",
|
| + "../..",
|
| ]
|
|
|
| - # mkvmuxerutil.cpp redefines the _CRT_RAND_S macro. This is the only thing
|
| - # that blocks this target from using Chromium compiler settings.
|
| configs -= [ "//build/config/compiler:chromium_code" ]
|
| configs += [ "//build/config/compiler:no_chromium_code" ]
|
| }
|
|
|