psmattas/device_motorola_sanders-lineage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sanders: Copy vendor HIDL interface libs to /vendor

Browse Source 
Change-Id: Ia95e09b21ce42137cac9a1dd22f208fd9de9bf20
This commit is contained in:
dianlujitao
2018-10-21 17:54:12 +08:00
committed by ArmSM
parent 1abbac654c
commit 1ed9f16f78
2 changed files with 53 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
vndk/Android.mk
View File

@@ -20,9 +20,9 @@ install_in_hw_dir := \
vndk_sp_dir := vndk-sp-$(PLATFORM_VNDK_VERSION) vndk_sp_dir := vndk-sp-$(PLATFORM_VNDK_VERSION)
define define-vndk-sp-lib define define-vndk-lib
include $$(CLEAR_VARS) include $$(CLEAR_VARS)
LOCAL_MODULE := $1.vndk-sp-gen LOCAL_MODULE := $1.$2
LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_PREBUILT_MODULE_FILE := $$(call intermediates-dir-for,SHARED_LIBRARIES,$1,,,,)/$1.so LOCAL_PREBUILT_MODULE_FILE := $$(call intermediates-dir-for,SHARED_LIBRARIES,$1,,,,)/$1.so
LOCAL_STRIP_MODULE := false LOCAL_STRIP_MODULE := false
@@ -30,14 +30,14 @@ LOCAL_MULTILIB := first
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_INSTALLED_MODULE_STEM := $1.so LOCAL_INSTALLED_MODULE_STEM := $1.so
LOCAL_MODULE_SUFFIX := .so LOCAL_MODULE_SUFFIX := .so
LOCAL_MODULE_RELATIVE_PATH := $(vndk_sp_dir)$(if $(filter $1,$(install_in_hw_dir)),/hw) LOCAL_MODULE_RELATIVE_PATH := $3
LOCAL_CHECK_ELF_FILES := false LOCAL_VENDOR_MODULE := $4
include $$(BUILD_PREBUILT) include $$(BUILD_PREBUILT)
ifneq ($$(TARGET_2ND_ARCH),) ifneq ($$(TARGET_2ND_ARCH),)
ifneq ($$(TARGET_TRANSLATE_2ND_ARCH),true) ifneq ($$(TARGET_TRANSLATE_2ND_ARCH),true)
include $$(CLEAR_VARS) include $$(CLEAR_VARS)
LOCAL_MODULE := $1.vndk-sp-gen LOCAL_MODULE := $1.$2
LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_PREBUILT_MODULE_FILE := $$(call intermediates-dir-for,SHARED_LIBRARIES,$1,,,$$(TARGET_2ND_ARCH_VAR_PREFIX),)/$1.so LOCAL_PREBUILT_MODULE_FILE := $$(call intermediates-dir-for,SHARED_LIBRARIES,$1,,,$$(TARGET_2ND_ARCH_VAR_PREFIX),)/$1.so
LOCAL_STRIP_MODULE := false LOCAL_STRIP_MODULE := false
@@ -45,8 +45,8 @@ LOCAL_MULTILIB := 32
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_INSTALLED_MODULE_STEM := $1.so LOCAL_INSTALLED_MODULE_STEM := $1.so
LOCAL_MODULE_SUFFIX := .so LOCAL_MODULE_SUFFIX := .so
LOCAL_MODULE_RELATIVE_PATH := $(vndk_sp_dir)$(if $(filter $1,$(install_in_hw_dir)),/hw) LOCAL_MODULE_RELATIVE_PATH := $3
LOCAL_CHECK_ELF_FILES := false LOCAL_VENDOR_MODULE := $4
include $$(BUILD_PREBUILT) include $$(BUILD_PREBUILT)
endif # TARGET_TRANSLATE_2ND_ARCH is not true endif # TARGET_TRANSLATE_2ND_ARCH is not true
endif # TARGET_2ND_ARCH is not empty endif # TARGET_2ND_ARCH is not empty
@@ -61,7 +61,9 @@ $(foreach lib,$(VNDK_SAMEPROCESS_LIBRARIES),\
VNDK_SP_LIBRARIES := $(filter-out libz,$(VNDK_SP_LIBRARIES)) VNDK_SP_LIBRARIES := $(filter-out libz,$(VNDK_SP_LIBRARIES))
$(foreach lib,$(VNDK_SP_LIBRARIES),\ $(foreach lib,$(VNDK_SP_LIBRARIES),\
$(eval $(call define-vndk-sp-lib,$(lib)))) $(eval $(call define-vndk-lib,$(lib),vndk-sp-gen,$(vndk_sp_dir),)))
$(foreach lib,$(EXTRA_VENDOR_LIBRARIES),\
$(eval $(call define-vndk-lib,$(lib),vndk-ext-gen,,true)))
install_in_hw_dir := install_in_hw_dir :=
@@ -69,6 +71,8 @@ include $(CLEAR_VARS)
LOCAL_MODULE := vndk-sp LOCAL_MODULE := vndk-sp
LOCAL_MODULE_OWNER := google LOCAL_MODULE_OWNER := google
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_REQUIRED_MODULES := $(addsuffix .vndk-sp-gen,$(VNDK_SP_LIBRARIES)) LOCAL_REQUIRED_MODULES := \
$(addsuffix .vndk-sp-gen,$(VNDK_SP_LIBRARIES)) \
$(addsuffix .vndk-ext-gen,$(EXTRA_VENDOR_LIBRARIES))
include $(BUILD_PHONY_PACKAGE) include $(BUILD_PHONY_PACKAGE)
endif endif

40
vndk/vndk-sp-libs.mk Normal file
View File

@@ -0,0 +1,40 @@
VNDK_SP_LIBRARIES := \
android.hardware.graphics.allocator@2.0 \
android.hardware.graphics.mapper@2.0 \
android.hardware.graphics.mapper@2.1 \
android.hardware.graphics.common@1.0 \
android.hardware.graphics.common@1.1 \
android.hardware.renderscript@1.0 \
android.hidl.base@1.0 \
android.hidl.memory@1.0 \
libRSCpuRef \
libRSDriver \
libRS_internal \
libbacktrace \
libbase \
libbcinfo \
libblas \
libc++ \
libcompiler_rt \
libcutils \
libft2 \
libhardware \
libhidlbase \
libhidlmemory \
libhidltransport \
libhwbinder \
libion \
liblzma \
libpng \
libunwind \
libunwindstack\
libutils \
libutilscallstack \
libdexfile \
EXTRA_VENDOR_LIBRARIES := \
vendor.display.config@1.0 \
vendor.display.config@1.1 \
vendor.display.config@1.2 \
vendor.nxp.nxpnfc@1.0 \
vendor.qti.hardware.camera.device@1.0