Evolution-x-devices/device_google_wahoo
2
0
Fork 0
mirror of https://github.com/Evolution-X-Devices/device_google_wahoo synced 2026-02-01 07:50:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Remove the tricky *.vndk-sp modules" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-09-06 19:06:47 +00:00
committed by Android (Google) Code Review
parent a5d2a58cc1 67049066a8
commit 7c6c93c916
2 changed files with 1 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
device.mk
View File

@@ -535,34 +535,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
ro.frp.pst=/dev/block/platform/soc/1da4000.ufshc/by-name/frp
PRODUCT_PROPERTY_OVERRIDES += \
ro.vendor.vndk.version=26.1.0 \
# Once BOARD_VNDK_VERSION is defined, below packages will not be used
PRODUCT_PACKAGES += \
android.hardware.renderscript@1.0.vndk-sp\
android.hardware.graphics.allocator@2.0.vndk-sp\
android.hardware.graphics.mapper@2.0.vndk-sp\
android.hardware.graphics.common@1.0.vndk-sp\
libhwbinder.vndk-sp\
libbase.vndk-sp\
libcutils.vndk-sp\
libhardware.vndk-sp\
libhidlbase.vndk-sp\
libhidltransport.vndk-sp\
libutils.vndk-sp\
libc++.vndk-sp\
libRS_internal.vndk-sp\
libRSDriver.vndk-sp\
libRSCpuRef.vndk-sp\
libbcinfo.vndk-sp\
libblas.vndk-sp\
libft2.vndk-sp\
libpng.vndk-sp\
libcompiler_rt.vndk-sp\
libbacktrace.vndk-sp\
libunwind.vndk-sp\
liblzma.vndk-sp\
libz.vndk-sp\
ro.vendor.vndk.version=27.1.0 \
# Include vndk/vndk-sp/ll-ndk modules
PRODUCT_PACKAGES += vndk_package

59
vndk/Android.mk
View File

@@ -1,59 +0,0 @@
ifneq ($(filter muskie walleye taimen, $(TARGET_DEVICE)),)
LOCAL_PATH := $(call my-dir)
ifndef BOARD_VNDK_VERSION
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\
libutils\
libc++\
libbacktrace\
libunwind\
liblzma\
libhidlbase\
libhidltransport\
libz\
libbcinfo\
libblas\
libcompiler_rt\
libRS_internal\
libRSDriver\
libRSCpuRef\
libft2\
libpng\
endif
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