asgardius/android_device_samsung_msm8996-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update vndk/hudl stuff

Browse source
This commit is contained in:
Valera1978 2019-12-06 13:26:12 +03:00
parent be2448753d
commit c8691e344f
4 changed files with 44 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
device.mk
View file

@ -232,8 +232,7 @@ PRODUCT_PACKAGES += \
# HIDL # HIDL
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hidl.base@1.0 \ android.hidl.base@1.0
android.hidl.manager@1.0
# Telephony # Telephony
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \

9
libhidl/Android.mk
View file

@ -16,13 +16,6 @@
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SHARED_LIBRARIES := libhidltransport LOCAL_SHARED_LIBRARIES := libhidltransport
LOCAL_MODULE := android.hidl.base@1.0 LOCAL_MODULE := android.hidl.base@1.0
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_VENDOR_MODULE := true
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_SHARED_LIBRARIES := libhidltransport
LOCAL_MODULE := android.hidl.manager@1.0
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_VENDOR_MODULE := true
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

29
vndk/Android.mk
View file

@ -2,17 +2,7 @@ ifeq ($(BOARD_VNDK_VERSION),)
$(warning ************* BOARD VNDK is not enabled - compiling vndk-sp ***************************) $(warning ************* BOARD VNDK is not enabled - compiling vndk-sp ***************************)
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
ifndef BOARD_VNDK_VERSION include $(LOCAL_PATH)/vndk-sp-libs.mk
VNDK_SP_LIBRARIES := \
libdexfile \
libartbase \
libunwind \
libunwindstack \
libziparchive
install_in_hw_dir := \
android.hidl.memory@1.0-impl
vndk_sp_dir := vndk-sp-$(PLATFORM_VNDK_VERSION) vndk_sp_dir := vndk-sp-$(PLATFORM_VNDK_VERSION)
@ -20,7 +10,7 @@ define define-vndk-sp-lib
include $$(CLEAR_VARS) include $$(CLEAR_VARS)
LOCAL_MODULE := $1.vndk-sp-gen LOCAL_MODULE := $1.vndk-sp-gen
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
LOCAL_MULTILIB := first LOCAL_MULTILIB := first
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
@ -34,7 +24,7 @@ ifneq ($$(TARGET_TRANSLATE_2ND_ARCH),true)
include $$(CLEAR_VARS) include $$(CLEAR_VARS)
LOCAL_MODULE := $1.vndk-sp-gen LOCAL_MODULE := $1.vndk-sp-gen
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
LOCAL_MULTILIB := 32 LOCAL_MULTILIB := 32
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
@ -46,25 +36,14 @@ endif # TARGET_TRANSLATE_2ND_ARCH is not true
endif # TARGET_2ND_ARCH is not empty endif # TARGET_2ND_ARCH is not empty
endef endef
# Add VNDK-SP libs to the list if they are missing
$(foreach lib,$(VNDK_SAMEPROCESS_LIBRARIES),\
$(if $(filter $(lib),$(VNDK_SP_LIBRARIES)),,\
$(eval VNDK_SP_LIBRARIES += $(lib))))
# Remove libz from the VNDK-SP list (b/73296261)
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-sp-lib,$(lib))))
install_in_hw_dir :=
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := vndk-sp LOCAL_MODULE := vndk-sp
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))
include $(BUILD_PHONY_PACKAGE) include $(BUILD_PHONY_PACKAGE)
vndk_sp_dir := vndk_sp_dir :=
endif endif
endif

38
vndk/vndk-sp-libs.mk Normal file
View file

@ -0,0 +1,38 @@
VNDK_SP_LIBRARIES := \
android.hardware.graphics.mapper@2.0 \
android.hardware.graphics.mapper@2.1 \
android.hardware.graphics.mapper@3.0 \
android.hardware.graphics.common@1.0 \
android.hardware.graphics.common@1.1 \
android.hardware.graphics.common@1.2 \
android.hardware.renderscript@1.0 \
android.hidl.memory@1.0 \
android.hidl.memory.token@1.0 \
android.hidl.safe_union@1.0 \
libRSCpuRef \
libRSDriver \
libRS_internal \
libdexfile_support \
libbacktrace \
libbase \
libbcinfo \
libbinderthreadstate \
libblas \
libc++ \
libcompiler_rt \
libcutils \
libhardware \
libhidlbase \
libhidlmemory \
libhidltransport \
libhwbinder_noltopgo \
libhwbinder \
libion \
libjsoncpp \
liblzma \
libprocessgroup \
libunwind \
libunwindstack\
libutils \
libutilscallstack \
libz