From b4abf77efc34e2409b122b65ff6be76216254929 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Fri, 28 Aug 2015 13:52:47 -0700
Subject: [PATCH] Remove manual #include "AndroidConfig.h".

That file (a) was always forced upon you anyway and (b) no longer
exists.

Change-Id: I5964a0420e9114419b62d5b98e7ecef6c5b48296
(cherry picked from commit c2d4ae15fbbb4ebee364449cf9693566e10d07a1)
---
 proprietary/drmwvmplugin/include/WVMDrmPlugin.h | 1 -
 proprietary/wvm/include/WVMExtractorImpl.h      | 1 -
 proprietary/wvm/include/WVMFileSource.h         | 1 -
 proprietary/wvm/include/WVMInfoListener.h       | 1 -
 proprietary/wvm/include/WVMMediaSource.h        | 1 -
 5 files changed, 5 deletions(-)

diff --git a/proprietary/drmwvmplugin/include/WVMDrmPlugin.h b/proprietary/drmwvmplugin/include/WVMDrmPlugin.h
index b85e0639..33ea0ac0 100644
--- a/proprietary/drmwvmplugin/include/WVMDrmPlugin.h
+++ b/proprietary/drmwvmplugin/include/WVMDrmPlugin.h
@@ -6,7 +6,6 @@
 #define __WVMDRMPLUGIN_H__
 
 
-#include <AndroidConfig.h>
 #include <DrmEngineBase.h>
 
 #include "WVDRMPluginAPI.h"
diff --git a/proprietary/wvm/include/WVMExtractorImpl.h b/proprietary/wvm/include/WVMExtractorImpl.h
index f1804dd7..17726f5a 100644
--- a/proprietary/wvm/include/WVMExtractorImpl.h
+++ b/proprietary/wvm/include/WVMExtractorImpl.h
@@ -6,7 +6,6 @@
 
 #define WVMEXTRACTOR_H_
 
-#include "AndroidConfig.h"
 #include "WVStreamControlAPI.h"
 #include "WVMInfoListener.h"
 #include "WVMExtractor.h"
diff --git a/proprietary/wvm/include/WVMFileSource.h b/proprietary/wvm/include/WVMFileSource.h
index 85d2142b..34f3d790 100644
--- a/proprietary/wvm/include/WVMFileSource.h
+++ b/proprietary/wvm/include/WVMFileSource.h
@@ -5,7 +5,6 @@
 #ifndef WVFILE_SOURCE_H_
 #define WVFILE_SOURCE_H_
 
-#include "AndroidConfig.h"
 #include "WVStreamControlAPI.h"
 #include <media/stagefright/DataSource.h>
 #include <utils/RefBase.h>
diff --git a/proprietary/wvm/include/WVMInfoListener.h b/proprietary/wvm/include/WVMInfoListener.h
index 728a85f4..05f5f04c 100644
--- a/proprietary/wvm/include/WVMInfoListener.h
+++ b/proprietary/wvm/include/WVMInfoListener.h
@@ -6,7 +6,6 @@
 
 #define WVMINFO_LISTENER_H
 
-#include "AndroidConfig.h"
 #include "WVMMediaSource.h"
 #include <media/stagefright/DataSource.h>
 #include "WVStreamControlAPI.h"
diff --git a/proprietary/wvm/include/WVMMediaSource.h b/proprietary/wvm/include/WVMMediaSource.h
index ab5ec1e5..2e11970b 100644
--- a/proprietary/wvm/include/WVMMediaSource.h
+++ b/proprietary/wvm/include/WVMMediaSource.h
@@ -6,7 +6,6 @@
 #ifndef WVMMEDIA_SOURCE_H_
 #define WVMMEDIA_SOURCE_H_
 
-#include "AndroidConfig.h"
 #include "WVStreamControlAPI.h"
 #include <media/stagefright/DataSource.h>
 #include <media/stagefright/MediaSource.h>