summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xparameter/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.mk2
-rwxr-xr-xxmlserializer/Android.mk8
6 files changed, 10 insertions, 10 deletions
diff --git a/parameter/Android.mk b/parameter/Android.mk
index 3a072ab..409f589 100755
--- a/parameter/Android.mk
+++ b/parameter/Android.mk
@@ -162,7 +162,7 @@ LOCAL_MODULE_TAGS := $(common_module_tags)
LOCAL_C_INCLUDES += \
$(common_c_includes) \
- $(call include-path-for, stlport) \
+ external/stlport/stlport \
bionic/
LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libdl libstlport
diff --git a/remote-process/Android.mk b/remote-process/Android.mk
index 1bb1be9..47af53c 100644
--- a/remote-process/Android.mk
+++ b/remote-process/Android.mk
@@ -63,7 +63,7 @@ LOCAL_CFLAGS := $(common_cflags)
LOCAL_C_INCLUDES += \
$(common_c_includes) \
- $(call include-path-for, stlport) \
+ external/stlport/stlport \
bionic/
LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libstlport
diff --git a/remote-processor/Android.mk b/remote-processor/Android.mk
index a823e6b..c0c5257 100644
--- a/remote-processor/Android.mk
+++ b/remote-processor/Android.mk
@@ -64,7 +64,7 @@ LOCAL_MODULE_TAGS := $(common_module_tags)
LOCAL_CFLAGS := $(common_cflags)
LOCAL_C_INCLUDES += \
- $(call include-path-for, stlport) \
+ external/stlport/stlport \
bionic/
LOCAL_SHARED_LIBRARIES := libstlport
diff --git a/test/test-platform/Android.mk b/test/test-platform/Android.mk
index a42efd9..6bca40d 100644
--- a/test/test-platform/Android.mk
+++ b/test/test-platform/Android.mk
@@ -56,8 +56,8 @@ LOCAL_MODULE_TAGS := $(common_module_tags)
LOCAL_C_INCLUDES += \
$(common_c_includes) \
- $(call include-path-for, stlport) \
- $(call include-path-for, libstdc++)/.. \
+ external/stlport/stlport \
+ bionic/libstdc++ \
bionic/
LOCAL_STATIC_LIBRARIES := libaudio_comms_convert
diff --git a/utility/Android.mk b/utility/Android.mk
index 1913fb7..941ba53 100644
--- a/utility/Android.mk
+++ b/utility/Android.mk
@@ -60,7 +60,7 @@ LOCAL_MODULE_TAGS := $(common_module_tags)
LOCAL_CFLAGS := $(common_cflags)
LOCAL_C_INCLUDES += \
- $(call include-path-for, stlport) \
+ external/stlport/stlport \
bionic
include $(BUILD_STATIC_LIBRARY)
diff --git a/xmlserializer/Android.mk b/xmlserializer/Android.mk
index 7b6840c..daa222e 100755
--- a/xmlserializer/Android.mk
+++ b/xmlserializer/Android.mk
@@ -54,9 +54,9 @@ common_cflags := \
-Wno-unused-parameter
common_c_includes := \
- $(call include-path-for, libxml2) \
- $(call include-path-for, webcore-icu) \
- $(call include-path-for, icu4c-common)
+ external/libxml2/include \
+ external/webkit/Source/WebCore/icu \
+ external/icu4c/common \
common_shared_libraries := libicuuc
common_static_libraries := libxml2
@@ -77,7 +77,7 @@ LOCAL_CFLAGS := $(common_cflags)
LOCAL_C_INCLUDES += \
$(common_c_includes) \
- $(call include-path-for, stlport) \
+ external/stlport/stlport \
bionic/
LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libstlport