commit 89683ee74156652964679b29ac557493fcc26a6a
author Linux Build Service Account <lnxbuild@localhost> Tue Nov 04 16:19:43 2014 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Nov 04 16:19:43 2014 -0800
tree 4e20119d3334c8538ebd7ca42ae0a2987f288589
parent a48dcd3480593de2efdf92af084655187c044f97
parent 8bff703334dbe63a23bd79841daab09df2c123a7

Merge "Data compilation fix:"

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