aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--parameter/Android.mk2
-rw-r--r--remote-process/Android.mk2
-rw-r--r--remote-processor/Android.mk2
-rw-r--r--test/test-platform/Android.mk4
-rw-r--r--utility/Android.mk4
-rw-r--r--xmlserializer/Android.mk6
6 files changed, 10 insertions, 10 deletions
diff --git a/parameter/Android.mk b/parameter/Android.mk
index df0bcd0..edfd71c 100644
--- a/parameter/Android.mk
+++ b/parameter/Android.mk
@@ -125,7 +125,7 @@ LOCAL_MODULE_TAGS := $(common_module_tags)
LOCAL_C_INCLUDES += \
$(common_c_includes) \
- external/stlport/stlport/ \
+ $(call include-path-for, stlport) \
bionic/
LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libdl libstlport
diff --git a/remote-process/Android.mk b/remote-process/Android.mk
index 8f0ca61..cc842f2 100644
--- a/remote-process/Android.mk
+++ b/remote-process/Android.mk
@@ -27,7 +27,7 @@ LOCAL_MODULE_TAGS := $(common_module_tags)
LOCAL_C_INCLUDES += \
$(common_c_includes) \
- external/stlport/stlport/ \
+ $(call include-path-for, stlport) \
bionic/
LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libstlport
diff --git a/remote-processor/Android.mk b/remote-processor/Android.mk
index efb06f4..d82d548 100644
--- a/remote-processor/Android.mk
+++ b/remote-processor/Android.mk
@@ -28,7 +28,7 @@ LOCAL_MODULE := $(common_module)
LOCAL_MODULE_TAGS := $(common_module_tags)
LOCAL_C_INCLUDES += \
- external/stlport/stlport/ \
+ $(call include-path-for, stlport) \
bionic/
LOCAL_SHARED_LIBRARIES := libstlport
diff --git a/test/test-platform/Android.mk b/test/test-platform/Android.mk
index 5330bcf..5755c38 100644
--- a/test/test-platform/Android.mk
+++ b/test/test-platform/Android.mk
@@ -27,8 +27,8 @@ LOCAL_MODULE_TAGS := $(common_module_tags)
LOCAL_C_INCLUDES += \
$(common_c_includes) \
- external/stlport/stlport/ \
- bionic/libstdc++ \
+ $(call include-path-for, stlport) \
+ $(call include-path-for, libstdc++)/.. \
bionic/
LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libstlport
diff --git a/utility/Android.mk b/utility/Android.mk
index 26fea09..a87df1c 100644
--- a/utility/Android.mk
+++ b/utility/Android.mk
@@ -21,8 +21,8 @@ LOCAL_MODULE := $(common_module)
LOCAL_MODULE_TAGS := $(common_module_tags)
LOCAL_C_INCLUDES += \
- external/stlport/stlport/ \
- bionic/
+ $(call include-path-for, stlport) \
+ bionic
include $(BUILD_STATIC_LIBRARY)
diff --git a/xmlserializer/Android.mk b/xmlserializer/Android.mk
index 449241b..799bf1c 100644
--- a/xmlserializer/Android.mk
+++ b/xmlserializer/Android.mk
@@ -20,8 +20,8 @@ common_module := libxmlserializer
common_module_tags := optional
common_c_includes := \
- external/libxml2/include/ \
- external/webkit/Source/WebCore/icu/ \
+ $(call include-path-for, libxml2) \
+ $(call include-path-for, webcore-icu) \
common_shared_libraries := libicuuc
common_static_libraries := libxml2
@@ -40,7 +40,7 @@ LOCAL_MODULE_TAGS := $(common_module_tags)
LOCAL_C_INCLUDES += \
$(common_c_includes) \
- external/stlport/stlport/ \
+ $(call include-path-for, stlport) \
bionic/
LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libstlport