muskie: copy vndk-sp libraries to /vendor/lib/vndk-sp

Note: this shouldn't be permanent solution. Anything that is installed
to /vendor partition must be compiled against the vndk build of the
system libraries, which might be different than the core build of the
libraries. However, since the number of such libraries are so many and
thus it takes considerable time to build them as vndk. So, in the mean
time, we just build vendor libraries against the core build as before
and copy the core builds to the vendor partition.

Bug: 37483222
Test: the listed files are in /vendor/lib(64?)/vndk-sp and their
contents are the same as those in /system/lib(64?).
Test: muskie/walleye boots

Change-Id: I143fb2cf8b6f3215a05582b23997150d75028adb
This commit is contained in:
Jiyong Park
2017-04-24 00:05:32 +09:00
parent b523193a48
commit 2c448274c6
2 changed files with 68 additions and 0 deletions

View File

@@ -509,3 +509,21 @@ PRODUCT_PACKAGES += \
# Storage: for factory reset protection feature
PRODUCT_PROPERTY_OVERRIDES += \
ro.frp.pst=/dev/block/platform/soc/1da4000.ufshc/by-name/frp
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\
android.hidl.base@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\
libbacktrace.vndk-sp\
libunwind.vndk-sp\
liblzma.vndk-sp\

50
vndk/Android.mk Normal file
View File

@@ -0,0 +1,50 @@
ifneq ($(filter muskie walleye, $(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\
android.hidl.base@1.0\
libhwbinder\
libbase\
libcutils\
libhardware\
libhidlbase\
libhidltransport\
libutils\
libc++\
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_VENDOR_MODULE := true
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_VENDOR_MODULE := true
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