Browse Source

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"
tags/17.1-branchpoint
Mauro Rossi 9 years ago
parent
commit
6facb0c08f
2 changed files with 2 additions and 4 deletions
  1. 2
    0
      Android.common.mk
  2. 0
    4
      src/util/Android.mk

+ 2
- 0
Android.common.mk View File

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

+ 0
- 4
src/util/Android.mk View File

@@ -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)

Loading…
Cancel
Save