commit 55f41bcc3edf282f236539bb26bd6dc8638f235e
author Chetan Rao <chetan.rao@intel.com> Mon Apr 29 11:53:42 2013 +0300
committer David Wagner <david.wagner@intel.com> Wed Feb 12 17:04:03 2014 +0100
tree 792c51775c76c7f8358099104237ede4a47e3368
parent d0d96a26ddbb9c79a5c795236f5a48cb390664a1

parameter-framework: Remove the hardcoding from TOP of tree

BZ: 120651

Remove the hard coding of path from TOP of android build tree.

pathmap_INCL has been extended to add AOSP include dirs used
by parameter framework. Need to use the MACRO include-path-for
defined in build/core/pathmap.mk to include the AOSP paths

Change-Id: Ic7c9eb4bcf39db5e31d14c785d8d2e37ab53af78
Signed-off-by: Chetan Rao <chetan.rao@intel.com>
Reviewed-on: http://android.intel.com:8080/105311
Reviewed-by: Dixon, CharlesX <charlesx.dixon@intel.com>
Tested-by: Barthes, FabienX <fabienx.barthes@intel.com>
Reviewed-by: Rocard, KevinX <kevinx.rocard@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

parameter/Android.mk

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_C_INCLUDES += \
     $(common_c_includes) \
-    external/stlport/stlport/ \
+    $(call include-path-for, stlport) \
     bionic/
 
 LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libdl libstlport

remote-process/Android.mk

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_C_INCLUDES += \
     $(common_c_includes) \
-    external/stlport/stlport/ \
+    $(call include-path-for, stlport) \
     bionic/
 
 LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libstlport

remote-processor/Android.mk

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_TAGS := $(common_module_tags)
 
 LOCAL_C_INCLUDES += \
-    external/stlport/stlport/ \
+    $(call include-path-for, stlport) \
     bionic/
 
 LOCAL_SHARED_LIBRARIES := libstlport

test/test-platform/Android.mk

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_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

utility/Android.mk

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_TAGS := $(common_module_tags)
 
 LOCAL_C_INCLUDES += \
-    external/stlport/stlport/ \
-    bionic/
+    $(call include-path-for, stlport) \
+    bionic
 
 include $(BUILD_STATIC_LIBRARY)
 

xmlserializer/Android.mk

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_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_C_INCLUDES += \
     $(common_c_includes) \
-    external/stlport/stlport/ \
+    $(call include-path-for, stlport) \
     bionic/
 
 LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libstlport