diff options
| author | Mauro Rossi <[email protected]> | 2017-03-04 22:11:27 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-03-04 21:47:26 +0000 |
| commit | 6facb0c08fa16e08939504aa8e5ac1462c7a6071 (patch) | |
| tree | d5b0a985ebfd8c792a172b484bee9696d13ca17e | |
| parent | 28fd6556c30096c415ebeb061d7e90b76d6b547d (diff) | |
android: fix libz dynamic library dependencies
Fixes a series of libz related building errors:
target SharedLib: gallium_dri_32
(out/target/prod...SHARED_LIBRARIES/gallium_dri_intermediates/LINKED/gallium_dri.so)
external/elfutils/libelf/elf_compress.c:117: error: undefined reference to 'deflateInit_'
...
external/elfutils/libelf/elf_compress.c:244: error: undefined reference to 'inflateEnd'
clang++: error: linker command failed with exit code 1 (use -v to see
invocation)
Fixes: 85a9b1b "util/disk_cache: compress individual cache entries"
| -rw-r--r-- | Android.common.mk | 2 | ||||
| -rw-r--r-- | src/util/Android.mk | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Android.common.mk b/Android.common.mk index 611162ab9a9..04045bd5a67 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -125,3 +125,5 @@ endif # Quiet down the build system and remove any .h files from the sources LOCAL_SRC_FILES := $(patsubst %.h, , $(LOCAL_SRC_FILES)) + +LOCAL_SHARED_LIBRARIES += libz diff --git a/src/util/Android.mk b/src/util/Android.mk index a139e68d514..a39185ae49e 100644 --- a/src/util/Android.mk +++ b/src/util/Android.mk @@ -53,8 +53,6 @@ $(LOCAL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ > $@ $(LOCAL_GENERATED_SOURCES): $(intermediates)/%.c: $(LOCAL_PATH)/%.py $(transform-generated-source) -LOCAL_SHARED_LIBRARIES := libz - include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -90,7 +88,5 @@ $(LOCAL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ > $@ $(LOCAL_GENERATED_SOURCES): $(intermediates)/%.c: $(LOCAL_PATH)/%.py $(transform-generated-source) -LOCAL_SHARED_LIBRARIES := libz - include $(MESA_COMMON_MK) include $(BUILD_HOST_STATIC_LIBRARY) |