IPACM: Fix the compilation errors
This change fixes the compilation errors.
Change-Id: I957bc8eb9462cedec693903e2b27888456fa2555
diff --git a/ipacm/inc/IPACM_Xml.h b/ipacm/inc/IPACM_Xml.h
index 06be0a9..f645ae1 100644
--- a/ipacm/inc/IPACM_Xml.h
+++ b/ipacm/inc/IPACM_Xml.h
@@ -40,10 +40,6 @@
#ifndef IPACM_XML_H
#define IPACM_XML_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
#include <linux/msm_ipa.h>
#include "IPACM_Defs.h"
#include <stdio.h>
@@ -53,6 +49,10 @@
#include <stdint.h>
#include <libxml/parser.h>
#include <libxml/tree.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#define IPACM_ASSERT(a) \
if (!(a)) { \
diff --git a/ipacm/src/Android.mk b/ipacm/src/Android.mk
index 64ee3ec..c52a8a4 100644
--- a/ipacm/src/Android.mk
+++ b/ipacm/src/Android.mk
@@ -3,7 +3,6 @@
ifneq ($(call is-board-platform-in-list,$(BOARD_PLATFORM_LIST)),true)
ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM)))
ifneq (, $(filter aarch64 arm arm64, $(TARGET_ARCH)))
-ifneq ($(TARGET_USES_AOSP),true)
LOCAL_PATH := $(call my-dir)
@@ -18,7 +17,6 @@
LOCAL_C_INCLUDES += external/icu4c/common
endif
LOCAL_C_INCLUDES += external/dhcpcd
-LOCAL_C_INCLUDES += bionic/libstdc++/include
LOCAL_C_INCLUDES += external/libxml2/include
LOCAL_C_INCLUDES += external/libnetfilter_conntrack/include
LOCAL_C_INCLUDES += external/libnfnetlink/include
@@ -63,7 +61,6 @@
LOCAL_SHARED_LIBRARIES += libxml2
LOCAL_SHARED_LIBRARIES += libnfnetlink
LOCAL_SHARED_LIBRARIES += libnetfilter_conntrack
-LOCAL_SHARED_LIBRARIES += libicuuc
LOCAL_SHARED_LIBRARIES += libdhcpcd
include $(BUILD_EXECUTABLE)
@@ -90,7 +87,6 @@
LOCAL_MODULE_OWNER := ipacm
include $(BUILD_PREBUILT)
-endif # not (TARGET_USES_AOSP)
endif # $(TARGET_ARCH)
endif
endif
\ No newline at end of file