mirror of
https://github.com/Evolution-X-Devices/device_google_wahoo
synced 2026-02-01 07:50:47 +00:00
1b65c6d094
This reverts commit b5f9e31877. This
commit removes libz.so from /system/lib[64]/vndk-sp.
We have to remove libz.so from vndk-sp because we don't have a good
mechanism to stop "classloader" linker namespace from loading
/system/lib[64]/vndk-sp/libz.so. Other alternatives require significant
changes to dynamic linker or CTS test cases.
Let's temporarily revert the commit to fix b/62195853 for oc-dr1-dev.
The long-term solution will be discussed in b/37617391.
Bug: 62195853
Bug: 37617391
Test: Boot sailfish to home screen.
Change-Id: I8591c153a1159ccfce6591b6cdc75722364e564b
56 lines
1.4 KiB
Makefile
56 lines
1.4 KiB
Makefile
ifneq ($(filter muskie walleye taimen, $(TARGET_DEVICE)),)
|
|
LOCAL_PATH := $(call my-dir)
|
|
|
|
VNDK_SP_LIBRARIES := \
|
|
android.hardware.renderscript@1.0\
|
|
android.hardware.graphics.allocator@2.0\
|
|
android.hardware.graphics.mapper@2.0\
|
|
android.hardware.graphics.common@1.0\
|
|
libhwbinder\
|
|
libbase\
|
|
libcutils\
|
|
libhardware\
|
|
libhidlbase\
|
|
libhidltransport\
|
|
libutils\
|
|
libc++\
|
|
libRS_internal\
|
|
libRSDriver\
|
|
libRSCpuRef\
|
|
libbcinfo\
|
|
libblas\
|
|
libft2\
|
|
libpng\
|
|
libcompiler_rt\
|
|
libbacktrace\
|
|
libunwind\
|
|
liblzma\
|
|
|
|
define add-vndk-sp-lib
|
|
include $$(CLEAR_VARS)
|
|
LOCAL_MODULE := $1.vndk-sp
|
|
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
|
|
LOCAL_PREBUILT_MODULE_FILE := $$(TARGET_OUT)/lib/$1.so
|
|
LOCAL_MULTILIB := 32
|
|
LOCAL_MODULE_TAGS := optional
|
|
LOCAL_INSTALLED_MODULE_STEM := $1.so
|
|
LOCAL_MODULE_SUFFIX := .so
|
|
LOCAL_MODULE_RELATIVE_PATH := vndk-sp
|
|
include $$(BUILD_PREBUILT)
|
|
|
|
include $$(CLEAR_VARS)
|
|
LOCAL_MODULE := $1.vndk-sp
|
|
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
|
|
LOCAL_PREBUILT_MODULE_FILE := $$(TARGET_OUT)/lib64/$1.so
|
|
LOCAL_MULTILIB := 64
|
|
LOCAL_MODULE_TAGS := optional
|
|
LOCAL_INSTALLED_MODULE_STEM := $1.so
|
|
LOCAL_MODULE_SUFFIX := .so
|
|
LOCAL_MODULE_RELATIVE_PATH := vndk-sp
|
|
include $$(BUILD_PREBUILT)
|
|
endef
|
|
|
|
$(foreach lib,$(VNDK_SP_LIBRARIES),\
|
|
$(eval $(call add-vndk-sp-lib,$(lib))))
|
|
endif # if TARGET_DEVICE is muskie or walleye
|