From b99e2e0c6dbea41591aa9ecd8ecd4f9737d51b52 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Sat, 6 Jun 2015 12:18:48 -0700 Subject: Fix Mac build. It's an error to build .a without source file on Mac. These two empty static libraries aren't used anywhere. Bug: 21669400 Change-Id: I73e0899378256ddf802eb7a3aafdbe43559baefe (cherry picked from commit f1ef7259741bdf99e2a5991bc12aa6cf4f551785) --- parameter/Android.mk | 33 --------------------------------- xmlserializer/Android.mk | 17 ----------------- 2 files changed, 50 deletions(-) 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_LDLIBS += -ldl 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) 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 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) 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) -- cgit v1.1