commit c99720d29f2ee618cc74c9336d2cd2a26544c020
author Ying Wang <wangying@google.com> Tue Jun 09 22:38:45 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 09 22:38:45 2015 +0000
tree 1a58e5b3240749056b49c1db8159c47389a3ce15
parent b99e2e0c6dbea41591aa9ecd8ecd4f9737d51b52
parent 0a3edf7907ec2e91b6b3a64f46fb55c7c00a01c4

Merge "Exclude from Mac build." into mnc-dev

parameter/Android.mk

diff --git a/parameter/Android.mk b/parameter/Android.mk
index 3e0068d..4ce29f1 100644
--- a/parameter/Android.mk
+++ b/parameter/Android.mk
@@ -189,36 +189,3 @@
 LOCAL_CLANG := false
 include $(BUILD_HOST_SHARED_LIBRARY)
 
-################################
-# Export includes for plugins (Target build)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := $(common_module)_includes
-LOCAL_MODULE_OWNER := intel
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-
-LOCAL_STATIC_LIBRARIES := \
-    libxmlserializer \
-    libpfw_utility \
-    libxml2
-
-include $(BUILD_STATIC_LIBRARY)
-
-################################
-# Export includes for plugins (Host build)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := $(common_module)_includes_host
-LOCAL_MODULE_OWNER := intel
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-
-LOCAL_STATIC_LIBRARIES := \
-    libxmlserializer_host \
-    libpfw_utility_host \
-    libxml2
-
-include $(BUILD_HOST_STATIC_LIBRARY)

xmlserializer/Android.mk

diff --git a/xmlserializer/Android.mk b/xmlserializer/Android.mk
index 1308c70..eedf48b 100644
--- a/xmlserializer/Android.mk
+++ b/xmlserializer/Android.mk
@@ -103,20 +103,3 @@
 
 include $(BUILD_HOST_STATIC_LIBRARY)
 
-################################
-# Export includes for plugins (Target build)
-include $(CLEAR_VARS)
-LOCAL_MODULE := $(common_module)_includes
-LOCAL_MODULE_OWNER := intel
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-LOCAL_STATIC_LIBRARIES := libxml2
-include $(BUILD_STATIC_LIBRARY)
-
-################################
-# Export includes for plugins (Host build)
-include $(CLEAR_VARS)
-LOCAL_MODULE := $(common_module)_includes
-LOCAL_MODULE_OWNER := intel
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-LOCAL_STATIC_LIBRARIES := libxml2
-include $(BUILD_HOST_STATIC_LIBRARY)