Add m-esr52 at 52.6.0

2 files changed, 22 insertions, 0 deletions

diff --git a/media/libyuv/tools/gritsettings/README b/media/libyuv/tools/gritsettings/README
new file mode 100644
index 000000000..ca9cb31f7
--- /dev/null
+++ b/media/libyuv/tools/gritsettings/README
@@ -0,0 +1,7 @@
+This is a dummy configuration file to workaround the assumption of the grit
+resource file being located here in the Chromium build toolchain.
+
+This is only needed for our Android native tests to be able to include the
+build/apk_test.gypi GYP file and depend on the
+<(DEPTH)/testing/android/native_test.gyp:native_test_native_code target in
+Chromium.
diff --git a/media/libyuv/tools/gritsettings/resource_ids b/media/libyuv/tools/gritsettings/resource_ids
new file mode 100644
index 000000000..bfdfbbe90
--- /dev/null
+++ b/media/libyuv/tools/gritsettings/resource_ids
@@ -0,0 +1,15 @@
+# Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+
+{
+  "SRCDIR": "../..",
+
+  "chromium/src/net/base/net_resources.grd": {
+    "includes": [4000],
+  },
+}