diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-01-30 02:46:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-30 02:46:55 +0000 |
| commit | 4bf309ee56108e775a2d8f9676ee5b91c025b199 (patch) | |
| tree | 1da1b8d12b5546c4f51361348fa179ae2c8e2f6d | |
| parent | 84678cdad689bb05139ee4df1d0b6702979cc50f (diff) | |
| parent | 9f02eec6dd5a014f45af2d77b0498fb24fcf0c37 (diff) | |
| download | webrtc-4bf309ee56108e775a2d8f9676ee5b91c025b199.tar.gz | |
Merge "Add empty Android.mk to prevent recursion." am: dbf4e66374 am: c6ebc088d5android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev
am: 9f02eec6dd
Change-Id: Ica423b2f555491560a66c4958f8cdd200d3fefbb
| -rw-r--r-- | Android.mk | 5 |
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. |