commit e7824f7fac28478dbc265ac57307f5effc907287
author Linux Build Service Account <lnxbuild@localhost> Sun Nov 09 23:40:50 2014 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Nov 09 23:40:50 2014 -0800
tree 0f743e56e50811168d8cc8d686839aeb93d13ccc
parent 392b33fff538c6145aaaa5e6b947b9f9b9bc30b4
parent 69b032b2080f5e771b09319f7c057a2fa1cfe48c

Merge "IPACM: fix the exception pipe index"

ipacm/inc/IPACM_Config.h

diff --git a/ipacm/inc/IPACM_Config.h b/ipacm/inc/IPACM_Config.h
index 92d4f72..79bc09c 100644
--- a/ipacm/inc/IPACM_Config.h
+++ b/ipacm/inc/IPACM_Config.h
@@ -62,7 +62,7 @@
     bool rx_bypass_ipa;          /* support WLAN may not register RX-property, should not add dependency */
 }ipa_rm_client;
 
-#define MAX_NUM_EXT_PROPS 10
+#define MAX_NUM_EXT_PROPS 15
 
 /* used to hold extended properties */
 typedef struct

ipacm/src/Android.mk

diff --git a/ipacm/src/Android.mk b/ipacm/src/Android.mk
index 1609ce7..d80be81 100644
--- a/ipacm/src/Android.mk
+++ b/ipacm/src/Android.mk
@@ -9,7 +9,11 @@
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../src
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../inc
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ipanat/inc
+ifeq ($(call is-platform-sdk-version-at-least,20),true)
+LOCAL_C_INCLUDES += external/icu/icu4c/source/common
+else
 LOCAL_C_INCLUDES += external/icu4c/common
+endif
 LOCAL_C_INCLUDES += external/dhcpcd
 LOCAL_C_INCLUDES += bionic/libstdc++/include
 LOCAL_C_INCLUDES += external/libxml2/include