summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--parameter/Android.mk52
-rw-r--r--remote-process/Android.mk36
-rw-r--r--remote-processor/Android.mk28
-rw-r--r--test/test-platform/Android.mk36
-rw-r--r--utility/Android.mk18
-rw-r--r--xmlserializer/Android.mk46
6 files changed, 108 insertions, 108 deletions
diff --git a/parameter/Android.mk b/parameter/Android.mk
index 196ae38..908e269 100644
--- a/parameter/Android.mk
+++ b/parameter/Android.mk
@@ -3,15 +3,15 @@ LOCAL_PATH := $(call my-dir)
####################
# Common definitions
-COMMON_COPY_HEADERS_TO := parameter
+common_copy_headers_to := parameter
-COMMON_COPY_HEADERS := \
+common_copy_headers := \
include/ParameterMgrPlatformConnector.h \
include/SelectionCriterionTypeInterface.h \
include/SelectionCriterionInterface.h \
include/ParameterHandle.h
-COMMON_SRC_FILES := \
+common_src_files := \
Subsystem.cpp \
PathNavigator.cpp \
Element.cpp \
@@ -97,41 +97,41 @@ COMMON_SRC_FILES := \
RuleParser.cpp \
EnumValuePair.cpp
-COMMON_MODULE := libparameter
-COMMON_MODULE_TAGS := optional
+common_module := libparameter
+common_module_tags := optional
-COMMON_C_INCLUDES := \
+common_c_includes := \
$(LOCAL_PATH)/include/ \
$(LOCAL_PATH)/../utility/ \
$(LOCAL_PATH)/../xmlserializer/ \
$(LOCAL_PATH)/../remote-processor/
-COMMON_SHARED_LIBRARIES := libicuuc
-COMMON_STATIC_LIBRARIES := libxml2
+common_shared_libraries := libicuuc
+common_static_libraries := libxml2
#############################
# Target build
include $(CLEAR_VARS)
-LOCAL_COPY_HEADERS_TO := $(COMMON_COPY_HEADERS_TO)
-LOCAL_COPY_HEADERS := $(COMMON_COPY_HEADERS)
+LOCAL_COPY_HEADERS_TO := $(common_copy_headers_to)
+LOCAL_COPY_HEADERS := $(common_copy_headers)
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
-LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
+LOCAL_SRC_FILES := $(common_src_files)
-LOCAL_MODULE := $(COMMON_MODULE)
-LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
+LOCAL_MODULE := $(common_module)
+LOCAL_MODULE_TAGS := $(common_module_tags)
-LOCAL_CFLAGS += $(COMMON_CFLAGS)
+LOCAL_CFLAGS += $(common_cflags)
LOCAL_C_INCLUDES += \
- $(COMMON_C_INCLUDES) \
+ $(common_c_includes) \
external/stlport/stlport/ \
bionic/
-LOCAL_SHARED_LIBRARIES := $(COMMON_SHARED_LIBRARIES) libdl libstlport
-LOCAL_STATIC_LIBRARIES := libxmlserializer libutility $(COMMON_STATIC_LIBRARIES)
+LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libdl libstlport
+LOCAL_STATIC_LIBRARIES := libxmlserializer libutility $(common_static_libraries)
include $(BUILD_SHARED_LIBRARY)
@@ -140,21 +140,21 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
-LOCAL_COPY_HEADERS_TO := $(COMMON_COPY_HEADERS_TO)
-LOCAL_COPY_HEADERS := $(COMMON_COPY_HEADERS)
+LOCAL_COPY_HEADERS_TO := $(common_copy_headers_to)
+LOCAL_COPY_HEADERS := $(common_copy_headers)
-LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
+LOCAL_SRC_FILES := $(common_src_files)
-LOCAL_MODULE := $(COMMON_MODULE)_host
-LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
+LOCAL_MODULE := $(common_module)_host
+LOCAL_MODULE_TAGS := $(common_module_tags)
-LOCAL_CFLAGS += $(COMMON_CFLAGS)
+LOCAL_CFLAGS += $(common_cflags)
LOCAL_C_INCLUDES += \
- $(COMMON_C_INCLUDES)
+ $(common_c_includes)
-LOCAL_SHARED_LIBRARIES := $(COMMON_SHARED_LIBRARIES)
-LOCAL_STATIC_LIBRARIES := libxmlserializer_host libutility_host $(COMMON_STATIC_LIBRARIES)
+LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)
+LOCAL_STATIC_LIBRARIES := libxmlserializer_host libutility_host $(common_static_libraries)
LOCAL_LDLIBS += -ldl
diff --git a/remote-process/Android.mk b/remote-process/Android.mk
index b4502eb..dfa7e03 100644
--- a/remote-process/Android.mk
+++ b/remote-process/Android.mk
@@ -3,35 +3,35 @@ LOCAL_PATH := $(call my-dir)
####################
# Common definitions
-COMMON_SRC_FILES := \
+common_src_files := \
main.cpp
-COMMON_MODULE := remote-process
-COMMON_MODULE_TAGS := optional
+common_module := remote-process
+common_module_tags := optional
-COMMON_C_INCLUDES := \
+common_c_includes := \
$(LOCAL_PATH)/../remote-processor/
-COMMON_SHARED_LIBRARIES := libremote-processor
+common_shared_libraries := libremote-processor
#############################
# Target build
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
+LOCAL_SRC_FILES := $(common_src_files)
-LOCAL_MODULE := $(COMMON_MODULE)
-LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
+LOCAL_MODULE := $(common_module)
+LOCAL_MODULE_TAGS := $(common_module_tags)
-LOCAL_CFLAGS += $(COMMON_CFLAGS)
+LOCAL_CFLAGS += $(common_cflags)
LOCAL_C_INCLUDES += \
- $(COMMON_C_INCLUDES) \
+ $(common_c_includes) \
external/stlport/stlport/ \
bionic/
-LOCAL_SHARED_LIBRARIES := $(COMMON_SHARED_LIBRARIES) libstlport
+LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libstlport
include $(BUILD_EXECUTABLE)
@@ -41,17 +41,17 @@ include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
+LOCAL_SRC_FILES := $(common_src_files)
-LOCAL_MODULE := $(COMMON_MODULE)_host
-LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
+LOCAL_MODULE := $(common_module)_host
+LOCAL_MODULE_TAGS := $(common_module_tags)
-LOCAL_CFLAGS += $(COMMON_CFLAGS)
+LOCAL_CFLAGS += $(common_cflags)
LOCAL_C_INCLUDES += \
- $(COMMON_C_INCLUDES)
+ $(common_c_includes)
-LOCAL_SHARED_LIBRARIES := $(foreach SHARED_LIBRARY,$(COMMON_SHARED_LIBRARIES), \
- $(SHARED_LIBRARY)_host)
+LOCAL_SHARED_LIBRARIES := $(foreach shared_library, $(common_shared_libraries), \
+ $(shared_library)_host)
include $(BUILD_HOST_EXECUTABLE)
diff --git a/remote-processor/Android.mk b/remote-processor/Android.mk
index 514afd9..55180b0 100644
--- a/remote-processor/Android.mk
+++ b/remote-processor/Android.mk
@@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir)
####################
# Common definitions
-COMMON_SRC_FILES := \
+common_src_files := \
Socket.cpp \
ListeningSocket.cpp \
ConnectionSocket.cpp \
@@ -13,21 +13,21 @@ COMMON_SRC_FILES := \
RemoteProcessorServer.cpp \
RemoteProcessorServerBuilder.cpp
-COMMON_MODULE := libremote-processor
-COMMON_MODULE_TAGS := optional
+common_module := libremote-processor
+common_module_tags := optional
-COMMON_LDLIBS := -lpthread
+common_ldlibs := -lpthread
#############################
# Target build
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
+LOCAL_SRC_FILES := $(common_src_files)
-LOCAL_MODULE := $(COMMON_MODULE)
-LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
+LOCAL_MODULE := $(common_module)
+LOCAL_MODULE_TAGS := $(common_module_tags)
-LOCAL_CFLAGS += $(COMMON_CFLAGS)
+LOCAL_CFLAGS += $(common_cflags)
LOCAL_C_INCLUDES += \
external/stlport/stlport/ \
@@ -35,7 +35,7 @@ LOCAL_C_INCLUDES += \
LOCAL_SHARED_LIBRARIES := libstlport
-LOCAL_LDLIBS += $(COMMON_LDLIBS)
+LOCAL_LDLIBS += $(common_ldlibs)
include $(BUILD_SHARED_LIBRARY)
@@ -44,13 +44,13 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
+LOCAL_SRC_FILES := $(common_src_files)
-LOCAL_MODULE := $(COMMON_MODULE)_host
-LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
+LOCAL_MODULE := $(common_module)_host
+LOCAL_MODULE_TAGS := $(common_module_tags)
-LOCAL_CFLAGS += $(COMMON_CFLAGS)
+LOCAL_CFLAGS += $(common_cflags)
-LOCAL_LDLIBS += $(COMMON_LDLIBS)
+LOCAL_LDLIBS += $(common_ldlibs)
include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/test/test-platform/Android.mk b/test/test-platform/Android.mk
index 5a91b02..2f973b7 100644
--- a/test/test-platform/Android.mk
+++ b/test/test-platform/Android.mk
@@ -3,37 +3,37 @@ LOCAL_PATH:= $(call my-dir)
####################
# Common definitions
-COMMON_SRC_FILES := \
+common_src_files := \
main.cpp \
TestPlatform.cpp
-COMMON_MODULE := test-platform
-COMMON_MODULE_TAGS := optional
+common_module := test-platform
+common_module_tags := optional
-COMMON_C_INCLUDES := \
+common_c_includes := \
$(LOCAL_PATH)/../../parameter/include \
$(LOCAL_PATH)/../../remote-processor/
-COMMON_SHARED_LIBRARIES := libparameter libremote-processor
+common_shared_libraries := libparameter libremote-processor
#############################
# Target build
include $(CLEAR_VARS)
-LOCAL_SRC_FILES:= $(COMMON_SRC_FILES)
+LOCAL_SRC_FILES:= $(common_src_files)
-LOCAL_MODULE:= $(COMMON_MODULE)
-LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
+LOCAL_MODULE:= $(common_module)
+LOCAL_MODULE_TAGS := $(common_module_tags)
-LOCAL_CFLAGS += $(COMMON_CFLAGS)
+LOCAL_CFLAGS += $(common_cflags)
LOCAL_C_INCLUDES += \
- $(COMMON_C_INCLUDES) \
+ $(common_c_includes) \
external/stlport/stlport/ \
bionic/libstdc++ \
bionic/
-LOCAL_SHARED_LIBRARIES := $(COMMON_SHARED_LIBRARIES) libstlport
+LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libstlport
include $(BUILD_EXECUTABLE)
@@ -42,16 +42,16 @@ include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
-LOCAL_SRC_FILES:= $(COMMON_SRC_FILES)
+LOCAL_SRC_FILES:= $(common_src_files)
-LOCAL_MODULE:= $(COMMON_MODULE)_host
-LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
+LOCAL_MODULE:= $(common_module)_host
+LOCAL_MODULE_TAGS := $(common_module_tags)
-LOCAL_CFLAGS += $(COMMON_CFLAGS)
+LOCAL_CFLAGS += $(common_cflags)
-LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
+LOCAL_C_INCLUDES += $(common_c_includes)
-LOCAL_SHARED_LIBRARIES := $(foreach SHARED_LIBRARY,$(COMMON_SHARED_LIBRARIES), \
- $(SHARED_LIBRARY)_host)
+LOCAL_SHARED_LIBRARIES := $(foreach shared_library, $(common_shared_libraries), \
+ $(shared_library)_host)
include $(BUILD_HOST_EXECUTABLE)
diff --git a/utility/Android.mk b/utility/Android.mk
index 037d94a..26fea09 100644
--- a/utility/Android.mk
+++ b/utility/Android.mk
@@ -3,22 +3,22 @@ LOCAL_PATH := $(call my-dir)
####################
# Common definitions
-COMMON_SRC_FILES := \
+common_src_files := \
Tokenizer.cpp \
Utility.cpp
-COMMON_MODULE := libutility
-COMMON_MODULE_TAGS := optional
+common_module := libutility
+common_module_tags := optional
#############################
# Target build
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
+LOCAL_SRC_FILES := $(common_src_files)
-LOCAL_MODULE := $(COMMON_MODULE)
-LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
+LOCAL_MODULE := $(common_module)
+LOCAL_MODULE_TAGS := $(common_module_tags)
LOCAL_C_INCLUDES += \
external/stlport/stlport/ \
@@ -31,9 +31,9 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
+LOCAL_SRC_FILES := $(common_src_files)
-LOCAL_MODULE := $(COMMON_MODULE)_host
-LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
+LOCAL_MODULE := $(common_module)_host
+LOCAL_MODULE_TAGS := $(common_module_tags)
include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/xmlserializer/Android.mk b/xmlserializer/Android.mk
index 2b06440..e71419f 100644
--- a/xmlserializer/Android.mk
+++ b/xmlserializer/Android.mk
@@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir)
####################
# Common definitions
-COMMON_SRC_FILES := \
+common_src_files := \
XmlElement.cpp \
XmlSerializingContext.cpp \
XmlDocSource.cpp \
@@ -15,40 +15,40 @@ COMMON_SRC_FILES := \
XmlFileDocSource.cpp \
XmlStringDocSource.cpp
-COMMON_MODULE := libxmlserializer
+common_module := libxmlserializer
-COMMON_MODULE_TAGS := optional
+common_module_tags := optional
-COMMON_C_INCLUDES := \
+common_c_includes := \
external/libxml2/include/ \
external/webkit/Source/WebCore/icu/ \
-COMMON_SHARED_LIBRARIES := libicuuc
-COMMON_STATIC_LIBRARIES := libxml2
+common_shared_libraries := libicuuc
+common_static_libraries := libxml2
-COMMON_LDLIBS := -Lexternal/libxml2/lib
+common_ldlibs := -Lexternal/libxml2/lib
#############################
# Target build
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
+LOCAL_SRC_FILES := $(common_src_files)
-LOCAL_MODULE := $(COMMON_MODULE)
-LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
+LOCAL_MODULE := $(common_module)
+LOCAL_MODULE_TAGS := $(common_module_tags)
-LOCAL_CFLAGS += $(COMMON_CFLAGS)
+LOCAL_CFLAGS += $(common_cflags)
LOCAL_C_INCLUDES += \
- $(COMMON_C_INCLUDES) \
+ $(common_c_includes) \
external/stlport/stlport/ \
bionic/
-LOCAL_SHARED_LIBRARIES := $(COMMON_SHARED_LIBRARIES) libstlport
-LOCAL_STATIC_LIBRARIES := $(COMMON_STATIC_LIBRARIES)
+LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libstlport
+LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
-LOCAL_LDLIBS += $(COMMON_LDLIBS)
+LOCAL_LDLIBS += $(common_ldlibs)
include $(BUILD_STATIC_LIBRARY)
@@ -57,19 +57,19 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
+LOCAL_SRC_FILES := $(common_src_files)
-LOCAL_MODULE := $(COMMON_MODULE)_host
-LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
+LOCAL_MODULE := $(common_module)_host
+LOCAL_MODULE_TAGS := $(common_module_tags)
-LOCAL_CFLAGS += $(COMMON_CFLAGS)
+LOCAL_CFLAGS += $(common_cflags)
LOCAL_C_INCLUDES += \
- $(COMMON_C_INCLUDES)
+ $(common_c_includes)
-LOCAL_SHARED_LIBRARIES := $(COMMON_SHARED_LIBRARIES)
-LOCAL_STATIC_LIBRARIES := $(COMMON_STATIC_LIBRARIES)
+LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)
+LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
-LOCAL_LDLIBS += $(COMMON_LDLIBS)
+LOCAL_LDLIBS += $(common_ldlibs)
include $(BUILD_HOST_STATIC_LIBRARY)
generated by cgit v1.1 at 2024-05-03 01:08:03 +0000