aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2018-01-30 02:41:18 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-01-30 02:41:18 +0000
commitc6ebc088d5d66f3fbeac5498122c3727acf6f750 (patch)
tree1da1b8d12b5546c4f51361348fa179ae2c8e2f6d
parente246bc0c4675d0d6d76cf507617e2b48b7543c99 (diff)
parentdbf4e663744fae37318982fe5c394cf4f97e2a76 (diff)
downloadwebrtc-c6ebc088d5d66f3fbeac5498122c3727acf6f750.tar.gz
Merge "Add empty Android.mk to prevent recursion."
am: dbf4e66374 Change-Id: Iff8ffb5b67b29598bd6aa3cacffeef3b6b63efea
-rw-r--r--Android.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000000..3622a71260
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,5 @@
+# Intentially empty, to prevent recursion
+#
+# There is an NDK test under modules/audio_procesing/test. The NDK build system
+# uses Android.mk files too, but they're not compatible with the Platform
+# Android.mk files.