commit 6dfb2569327cdcd05bc8b36f6467974ff8e862ab
author Ray Essick <essick@google.com> Fri Dec 04 14:03:03 2020 -0800
committer Ray Essick <essick@google.com> Fri Dec 04 14:06:47 2020 -0800
tree 1e9446837f0946d3e0f8cc5c9e1c4037ebc5862b
parent 38e547c714a515d76665be73060fba53df7da218
parent d9eb0959c6092bc4206e38cac3d6e7529e23aa27

Merge commit 'd9eb0959c6092bc4206e38cac3d6e7529e23aa27' into manual_merge_dfb3683bbef889fa72df975ebe45b0b1f65934ff

Bug: None
Test: automerger
Change-Id: Ie44d65ea066da5e5a7b24c8dea4ec8a560a86168

src/jni/rtp/Android.bp

diff --git a/src/jni/rtp/Android.bp b/src/jni/rtp/Android.bp
index b6c8588..b933054 100644
--- a/src/jni/rtp/Android.bp
+++ b/src/jni/rtp/Android.bp
@@ -45,10 +45,6 @@
         "libstagefright_amrnbdec",
         "libstagefright_amrnbenc",
     ],
-    include_dirs: [
-        "frameworks/av/media/libstagefright/codecs/amrnb/enc/src",
-        "frameworks/av/media/libstagefright/codecs/amrnb/dec/src",
-    ],
     cflags: [
         "-fvisibility=hidden",
         "-Wall",