aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2018-01-30 02:44:23 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-01-30 02:44:23 +0000
commit9f02eec6dd5a014f45af2d77b0498fb24fcf0c37 (patch)
tree1da1b8d12b5546c4f51361348fa179ae2c8e2f6d
parent971b703804bfd0e0c2ef341835b18c49d2371d46 (diff)
parentc6ebc088d5d66f3fbeac5498122c3727acf6f750 (diff)
downloadwebrtc-9f02eec6dd5a014f45af2d77b0498fb24fcf0c37.tar.gz
Merge "Add empty Android.mk to prevent recursion." am: dbf4e66374
am: c6ebc088d5 Change-Id: I97d9b65784d9d75c0767d17e65c68ddeb6e5e12b
-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.