diff options
| -rw-r--r-- | BoardConfigCommon.mk | 3 | ||||
| -rw-r--r-- | db820c/device.mk | 10 | ||||
| -rw-r--r-- | device-common.mk | 59 | ||||
| -rw-r--r-- | init.common.rc | 4 | ||||
| -rw-r--r-- | vndk/Android.mk | 61 |
5 files changed, 116 insertions, 21 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index e8e5a23..6f8a5c9 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -43,6 +43,9 @@ BOARD_USES_DRM_HWCOMPOSER := true BOARD_GPU_DRIVERS := freedreno virgl TARGET_USES_HWC2 := true +# Recommended for Treble work +BOARD_VNDK_VERSION := current + # WiFi WPA_SUPPLICANT_VERSION := VER_0_8_X BOARD_WPA_SUPPLICANT_DRIVER := NL80211 diff --git a/db820c/device.mk b/db820c/device.mk index 15311ab..cd2338d 100644 --- a/db820c/device.mk +++ b/db820c/device.mk @@ -16,10 +16,10 @@ PRODUCT_COPY_FILES := \ device/linaro/dragonboard-kernels/$(TARGET_PREBUILT_KERNEL):kernel \ - device/linaro/dragonboard/fstab.common:root/fstab.db820c \ - device/linaro/dragonboard/init.common.rc:root/init.db820c.rc \ - device/linaro/dragonboard/init.common.usb.rc:root/init.db820c.usb.rc \ - device/linaro/dragonboard/ueventd.common.rc:root/ueventd.db820c.rc \ - device/linaro/dragonboard/common.kl:system/usr/keylayout/db820c.kl + device/linaro/dragonboard/fstab.common:$(TARGET_COPY_OUT_VENDOR)/etc/init/fstab.db820c \ + device/linaro/dragonboard/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.db820c.rc \ + device/linaro/dragonboard/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.db820c.usb.rc \ + device/linaro/dragonboard/ueventd.common.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.db820c.rc \ + device/linaro/dragonboard/common.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/db820c.kl $(call inherit-product, $(LOCAL_PATH)/firmware/device.mk) diff --git a/device-common.mk b/device-common.mk index 087e2a7..044bc7a 100644 --- a/device-common.mk +++ b/device-common.mk @@ -20,6 +20,9 @@ DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay # Build and run only ART PRODUCT_RUNTIMES := runtime_libart_default +# enable Treble +PRODUCT_FULL_TREBLE_OVERRIDE := true + # DRM PRODUCT_PACKAGES := \ android.hardware.drm@1.0-impl \ @@ -52,20 +55,21 @@ PRODUCT_PROPERTY_OVERRIDES := \ wifi.supplicant_scan_interval=15 PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \ - frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \ - device/linaro/hikey/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf + frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \ + frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml \ + device/linaro/hikey/wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf # Enable BT PRODUCT_PACKAGES += \ android.hardware.bluetooth@1.0-service.btlinux PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \ - frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml + frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \ + frameworks/native/data/etc/android.hardware.bluetooth_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth_le.xml # Audio PRODUCT_PACKAGES += \ + android.hardware.audio@2.0-service \ android.hardware.audio@2.0-impl \ android.hardware.audio@2.0-service \ android.hardware.audio.effect@2.0-impl \ @@ -102,12 +106,39 @@ PRODUCT_PACKAGES += \ # Copy standard platform config files PRODUCT_COPY_FILES += \ - device/linaro/hikey/etc/permissions/android.hardware.screen.xml:system/etc/permissions/android.hardware.screen.xml \ - frameworks/native/data/etc/android.software.cts.xml:system/etc/permissions/android.software.cts.xml \ - frameworks/native/data/etc/android.software.app_widgets.xml:system/etc/permissions/android.software.app_widgets.xml \ - frameworks/native/data/etc/android.software.backup.xml:system/etc/permissions/android.software.backup.xml \ - frameworks/native/data/etc/android.software.voice_recognizers.xml:system/etc/permissions/android.software.voice_recognizers.xml \ - frameworks/native/data/etc/android.hardware.ethernet.xml:system/etc/permissions/android.hardware.ethernet.xml \ - frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \ - frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \ - frameworks/native/data/etc/android.software.device_admin.xml:system/etc/permissions/android.software.device_admin.xml + device/linaro/hikey/etc/permissions/android.hardware.screen.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.screen.xml \ + frameworks/native/data/etc/android.software.cts.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.cts.xml \ + frameworks/native/data/etc/android.software.app_widgets.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.app_widgets.xml \ + frameworks/native/data/etc/android.software.backup.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.backup.xml \ + frameworks/native/data/etc/android.software.voice_recognizers.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.voice_recognizers.xml \ + frameworks/native/data/etc/android.hardware.ethernet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.ethernet.xml \ + frameworks/native/data/etc/android.hardware.usb.accessory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.accessory.xml \ + frameworks/native/data/etc/android.hardware.usb.host.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.host.xml \ + frameworks/native/data/etc/android.software.device_admin.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_admin.xml + +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\ + libunwindstack.vndk-sp\ + liblzma.vndk-sp\ + diff --git a/init.common.rc b/init.common.rc index 6eaf705..683f80b 100644 --- a/init.common.rc +++ b/init.common.rc @@ -1,8 +1,8 @@ import init.${ro.hardware}.usb.rc on fs - mount_all /fstab.${ro.hardware} - swapon_all /fstab.${ro.hardware} + mount_all /vendor/etc/init/fstab.${ro.hardware} + swapon_all /vendor/etc/init/fstab.${ro.hardware} setprop ro.crypto.fuse_sdcard false on init diff --git a/vndk/Android.mk b/vndk/Android.mk new file mode 100644 index 0000000..79298d4 --- /dev/null +++ b/vndk/Android.mk @@ -0,0 +1,61 @@ +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\ + libbinder\ + libhwbinder\ + libvndksupport\ + libfmq\ + libbase\ + libcutils\ + libhardware\ + libhidlbase\ + libhidltransport\ + libutils\ + libc++\ + libRS_internal\ + libRSDriver\ + libRSCpuRef\ + libbcinfo\ + libblas\ + libft2\ + libpng\ + libcompiler_rt\ + libbacktrace\ + libunwind\ + libunwindstack\ + libui\ + liblzma\ + +#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)))) |