commit a80509cafd9b132999fe28b3a143933dfb7f5cbb
author Christopher Ferris <cferris@google.com> Wed Jun 24 03:16:47 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 24 03:16:47 2020 +0000
tree db3dbe62e8d690dbaf9cb772ac8a804756b0499c
parent 4b34c69843b35802fa07ab52bd0d1a2ae15c67d5
parent bc2823763f293e5a33442f7fd8c8b05b12d35883

Merge "Remove references to libc_scudo."

media/codec2/Android.mk

diff --git a/media/codec2/Android.mk b/media/codec2/Android.mk
index 82d739f..17f28ff 100644
--- a/media/codec2/Android.mk
+++ b/media/codec2/Android.mk
@@ -45,4 +45,4 @@
 .PHONY: docs-all
 docs-all: docs-api docs-internal
 
-include $(call all-makefiles-under,$(call my-dir))
+include $(call first-makefiles-under,$(call my-dir))

media/libeffects/preprocessing/Android.bp

diff --git a/media/libeffects/preprocessing/Android.bp b/media/libeffects/preprocessing/Android.bp
index c87635f..16cd0ad 100644
--- a/media/libeffects/preprocessing/Android.bp
+++ b/media/libeffects/preprocessing/Android.bp
@@ -8,12 +8,6 @@
 
     srcs: ["PreProcessing.cpp"],
 
-    include_dirs: [
-        "external/webrtc",
-        "external/webrtc/webrtc/modules/include",
-        "external/webrtc/webrtc/modules/audio_processing/include",
-    ],
-
     shared_libs: [
         "libwebrtc_audio_preprocessing",
         "libspeexresampler",