summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Onorato2012-07-23 21:15:14 -0500
committerJoe Onorato2012-08-15 21:52:52 -0500
commit5069b01e21129fe2d42a28e850645376560f2029 (patch)
treebea871bb0942e5399a6de744e29f7e276356c962 /libsparse
parent1926c15a1219bc8426e0b9131633e02c76929fb7 (diff)
downloadplatform-system-core-5069b01e21129fe2d42a28e850645376560f2029.tar.gz
platform-system-core-5069b01e21129fe2d42a28e850645376560f2029.tar.xz
platform-system-core-5069b01e21129fe2d42a28e850645376560f2029.zip
Support for multiple modules with the same name is going away.
Change-Id: I5006b467978071f9107babe532efa71d05061580
Diffstat (limited to 'libsparse')
-rw-r--r--libsparse/Android.mk72
1 files changed, 35 insertions, 37 deletions
diff --git a/libsparse/Android.mk b/libsparse/Android.mk
index 69b52c387..9025cc025 100644
--- a/libsparse/Android.mk
+++ b/libsparse/Android.mk
@@ -10,92 +10,90 @@ libsparse_src_files := \
10 sparse_err.c \ 10 sparse_err.c \
11 sparse_read.c 11 sparse_read.c
12 12
13include $(CLEAR_VARS)
14 13
14include $(CLEAR_VARS)
15LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include 15LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
16LOCAL_SRC_FILES := $(libsparse_src_files) 16LOCAL_SRC_FILES := $(libsparse_src_files)
17LOCAL_MODULE := libsparse 17LOCAL_MODULE := libsparse_host
18LOCAL_MODULE_TAGS := optional
19LOCAL_STATIC_LIBRARIES := libz 18LOCAL_STATIC_LIBRARIES := libz
20LOCAL_C_INCLUDES += $(LOCAL_PATH)/include external/zlib 19LOCAL_C_INCLUDES += $(LOCAL_PATH)/include external/zlib
21
22include $(BUILD_HOST_STATIC_LIBRARY) 20include $(BUILD_HOST_STATIC_LIBRARY)
23 21
24include $(CLEAR_VARS)
25 22
23include $(CLEAR_VARS)
26LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include 24LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
27LOCAL_SRC_FILES := $(libsparse_src_files) 25LOCAL_SRC_FILES := $(libsparse_src_files)
28LOCAL_MODULE := libsparse 26LOCAL_MODULE := libsparse
29LOCAL_MODULE_TAGS := optional
30LOCAL_C_INCLUDES += $(LOCAL_PATH)/include external/zlib 27LOCAL_C_INCLUDES += $(LOCAL_PATH)/include external/zlib
31LOCAL_SHARED_LIBRARIES := libz 28LOCAL_SHARED_LIBRARIES := \
32 29 libz
33include $(BUILD_SHARED_LIBRARY) 30include $(BUILD_SHARED_LIBRARY)
34 31
35include $(CLEAR_VARS)
36 32
33include $(CLEAR_VARS)
37LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include 34LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
38LOCAL_SRC_FILES := $(libsparse_src_files) 35LOCAL_SRC_FILES := $(libsparse_src_files)
39LOCAL_MODULE := libsparse 36LOCAL_MODULE := libsparse_static
40LOCAL_MODULE_TAGS := optional
41LOCAL_C_INCLUDES += $(LOCAL_PATH)/include external/zlib 37LOCAL_C_INCLUDES += $(LOCAL_PATH)/include external/zlib
42LOCAL_STATIC_LIBRARIES := libz 38LOCAL_STATIC_LIBRARIES := libz
43
44include $(BUILD_STATIC_LIBRARY) 39include $(BUILD_STATIC_LIBRARY)
45 40
46include $(CLEAR_VARS)
47 41
42include $(CLEAR_VARS)
48LOCAL_SRC_FILES := simg2img.c \ 43LOCAL_SRC_FILES := simg2img.c \
49 sparse_crc32.c 44 sparse_crc32.c
50LOCAL_MODULE := simg2img 45LOCAL_MODULE := simg2img_host
51LOCAL_MODULE_TAGS := debug 46# Need a unique module name, but exe should still be called simg2img
52LOCAL_STATIC_LIBRARIES := libsparse libz 47LOCAL_MODULE_STEM := simg2img
53 48LOCAL_STATIC_LIBRARIES := \
49 libsparse_host \
50 libz
54include $(BUILD_HOST_EXECUTABLE) 51include $(BUILD_HOST_EXECUTABLE)
55 52
56include $(CLEAR_VARS)
57 53
54include $(CLEAR_VARS)
58LOCAL_SRC_FILES := simg2img.c \ 55LOCAL_SRC_FILES := simg2img.c \
59 sparse_crc32.c 56 sparse_crc32.c
60LOCAL_MODULE := simg2img 57LOCAL_MODULE := simg2img
61LOCAL_MODULE_TAGS := optional 58LOCAL_STATIC_LIBRARIES := \
62LOCAL_STATIC_LIBRARIES := libsparse libz 59 libsparse_static \
63 60 libz
64include $(BUILD_EXECUTABLE) 61include $(BUILD_EXECUTABLE)
65 62
66include $(CLEAR_VARS)
67 63
64include $(CLEAR_VARS)
68LOCAL_SRC_FILES := img2simg.c 65LOCAL_SRC_FILES := img2simg.c
69LOCAL_MODULE := img2simg 66LOCAL_MODULE := img2simg_host
70LOCAL_MODULE_TAGS := debug 67# Need a unique module name, but exe should still be called simg2img
71LOCAL_STATIC_LIBRARIES := libsparse libz 68LOCAL_MODULE_STEM := img2simg
72 69LOCAL_STATIC_LIBRARIES := \
70 libsparse_host \
71 libz
73include $(BUILD_HOST_EXECUTABLE) 72include $(BUILD_HOST_EXECUTABLE)
74 73
75include $(CLEAR_VARS)
76 74
75include $(CLEAR_VARS)
77LOCAL_SRC_FILES := img2simg.c 76LOCAL_SRC_FILES := img2simg.c
78LOCAL_MODULE := img2simg 77LOCAL_MODULE := img2simg
79LOCAL_MODULE_TAGS := optional 78LOCAL_STATIC_LIBRARIES := \
80LOCAL_STATIC_LIBRARIES := libsparse libz 79 libsparse_static \
81 80 libz
82include $(BUILD_EXECUTABLE) 81include $(BUILD_EXECUTABLE)
83 82
84include $(CLEAR_VARS)
85 83
84include $(CLEAR_VARS)
86LOCAL_SRC_FILES := simg2simg.c 85LOCAL_SRC_FILES := simg2simg.c
87LOCAL_MODULE := simg2simg 86LOCAL_MODULE := simg2simg
88LOCAL_MODULE_TAGS := debug 87LOCAL_STATIC_LIBRARIES := \
89LOCAL_STATIC_LIBRARIES := libsparse libz 88 libsparse_host \
90 89 libz
91include $(BUILD_HOST_EXECUTABLE) 90include $(BUILD_HOST_EXECUTABLE)
92 91
93include $(CLEAR_VARS)
94 92
93include $(CLEAR_VARS)
95LOCAL_MODULE := simg_dump.py 94LOCAL_MODULE := simg_dump.py
96LOCAL_MODULE_TAGS := debug
97LOCAL_SRC_FILES := simg_dump.py 95LOCAL_SRC_FILES := simg_dump.py
98LOCAL_MODULE_CLASS := EXECUTABLES 96LOCAL_MODULE_CLASS := EXECUTABLES
99LOCAL_IS_HOST_MODULE := true 97LOCAL_IS_HOST_MODULE := true
100
101include $(BUILD_PREBUILT) 98include $(BUILD_PREBUILT)
99