commit 23124b761018cac81ee694864f4be6373b841529
author Mattijs Korpershoek <mattijsx.korpershoek@intel.com> Fri Jun 27 09:58:03 2014 +0200
committer Mattijs Korpershoek <mattijsx.korpershoek@intel.com> Mon Jun 30 08:45:40 2014 +0200
tree f04c5ba6a3eee4660897114b7aa525dd53a3a0c8
parent 133d7cb1b373bb05201e8e26d0e456c1e98ef198

Fix stlport includes in makefiles

BZ: 207083

According to libstlport.mk, to use stlport for a given target, we shall
"include external/stlport/libstlport.mk" in the target.
This was not done in the parameter-framework's makefiles.

This patch change all targets which require stlport to include it in the
correct way.

Change-Id: Ie9b75af6269f172ad6a6c753e15efd0c7baafdd9
Signed-off-by: Mattijs Korpershoek <mattijsx.korpershoek@intel.com>

utility/Android.mk

diff --git a/utility/Android.mk b/utility/Android.mk
index 74f2e76..a224fe7 100644
--- a/utility/Android.mk
+++ b/utility/Android.mk
@@ -59,10 +59,7 @@
 
 LOCAL_CFLAGS := $(common_cflags)
 
-LOCAL_C_INCLUDES += \
-    external/stlport/stlport \
-    bionic
-
+include external/stlport/libstlport.mk
 include $(BUILD_STATIC_LIBRARY)
 
 ##############################