From 503fd9897724e83deb737af7858c4ca630c09a95 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Thu, 7 May 2015 11:33:52 -0700
Subject: Fix build from stlport.

This will need to be submitted upstream, but for now it's blocking the
build.

Can't test yet as the build is still red, but there's no risk doing
this for now because none of these modules are used yet.

Bug: 20915699
Change-Id: I9e7c8e237bec134985735dee4b4225b29793a792
(cherry picked from commit 6368380f06a48b0049118140f6ac5059f4e7f0f0)
---
 parameter/Android.mk          | 4 ++--
 remote-process/Android.mk     | 1 -
 remote-processor/Android.mk   | 1 -
 test/test-platform/Android.mk | 1 -
 utility/Android.mk            | 1 -
 xmlserializer/Android.mk      | 1 -
 6 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/parameter/Android.mk b/parameter/Android.mk
index 90e33f0..3e0068d 100644
--- a/parameter/Android.mk
+++ b/parameter/Android.mk
@@ -125,7 +125,8 @@ common_cflags := \
         -Wall \
         -Werror \
         -Wextra \
-        -Wno-unused-parameter
+        -Wno-unused-parameter \
+        -Wno-maybe-uninitialized \
 
 common_c_includes := \
     $(LOCAL_PATH)/include/ \
@@ -159,7 +160,6 @@ LOCAL_STATIC_LIBRARIES := libxmlserializer libpfw_utility libxml2
 LOCAL_REQUIRED_MODULES := libremote-processor
 
 LOCAL_CLANG := false
-include external/stlport/libstlport.mk
 include $(BUILD_SHARED_LIBRARY)
 
 ##############################
diff --git a/remote-process/Android.mk b/remote-process/Android.mk
index c842b2d..53d3ae6 100644
--- a/remote-process/Android.mk
+++ b/remote-process/Android.mk
@@ -68,7 +68,6 @@ LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)
 LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
 
 
-include external/stlport/libstlport.mk
 include $(BUILD_EXECUTABLE)
 
 ##############################
diff --git a/remote-processor/Android.mk b/remote-processor/Android.mk
index d3e5246..b8050b1 100644
--- a/remote-processor/Android.mk
+++ b/remote-processor/Android.mk
@@ -67,7 +67,6 @@ LOCAL_MODULE := $(common_module)
 LOCAL_MODULE_OWNER := intel
 LOCAL_MODULE_TAGS := $(common_module_tags)
 
-include external/stlport/libstlport.mk
 include $(BUILD_SHARED_LIBRARY)
 
 ##############################
diff --git a/test/test-platform/Android.mk b/test/test-platform/Android.mk
index a8dc619..e46ad57 100644
--- a/test/test-platform/Android.mk
+++ b/test/test-platform/Android.mk
@@ -63,7 +63,6 @@ LOCAL_LDLIBS := $(common_ldlibs)
 LOCAL_STATIC_LIBRARIES := libpfw_utility
 LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)
 
-include external/stlport/libstlport.mk
 include $(BUILD_EXECUTABLE)
 
 ##############################
diff --git a/utility/Android.mk b/utility/Android.mk
index 85b6c42..09f3de7 100644
--- a/utility/Android.mk
+++ b/utility/Android.mk
@@ -60,7 +60,6 @@ LOCAL_MODULE_TAGS := $(common_module_tags)
 
 LOCAL_CFLAGS := $(common_cflags)
 
-include external/stlport/libstlport.mk
 include $(BUILD_STATIC_LIBRARY)
 
 ##############################
diff --git a/xmlserializer/Android.mk b/xmlserializer/Android.mk
index 769acf8..1308c70 100644
--- a/xmlserializer/Android.mk
+++ b/xmlserializer/Android.mk
@@ -79,7 +79,6 @@ LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 
-include external/stlport/libstlport.mk
 include $(BUILD_STATIC_LIBRARY)
 
 ##############################
-- 
cgit v1.1