diff options
author | Sumit Semwal <sumit.semwal@linaro.org> | 2018-06-20 21:36:33 +0530 |
---|---|---|
committer | Sumit Semwal <sumit.semwal@linaro.org> | 2018-07-25 16:22:30 +0530 |
commit | d3042ff7b7861238493ec724f6c633db88962432 (patch) | |
tree | 51fccbf4e84988e859b842e316639510d1306a4a | |
parent | 55b7a26acbf365ccbf753561b629661106d9a4ed (diff) |
Enable FULL_TREBLE on dragonboarddb820c_treble
With these changes, DB820C boots to UI with FULL_TREBLE
enabled.
Most of this work is done standing on shoulders of giants -
Vishal Bhoj <vishal.bhoj@linaro.org>,
Amit Pundir <amit.pundir@linaro.org>
I just relied heavily on their advice to sort these out - ofcourse,
mistakes are all mine :)
Change-Id: I8a27fd05b1379c12150b279ad1bb433b6fd01c6d
Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
-rw-r--r-- | BoardConfigCommon.mk | 4 | ||||
-rw-r--r-- | db820c/device.mk | 12 | ||||
-rw-r--r-- | device-common.mk | 62 | ||||
-rw-r--r-- | fstab.common | 2 | ||||
-rw-r--r-- | init.common.rc | 4 | ||||
-rw-r--r-- | vndk/Android.mk | 61 |
6 files changed, 121 insertions, 24 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 118ce06..d176988 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -43,6 +43,10 @@ BOARD_USES_DRM_HWCOMPOSER := true BOARD_GPU_DRIVERS := freedreno virgl TARGET_USES_HWC2 := true +# enable Treble +PRODUCT_FULL_TREBLE_OVERRIDE := true +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 20fc9f2..6da564f 100644 --- a/db820c/device.mk +++ b/db820c/device.mk @@ -24,12 +24,12 @@ $(call inherit-product-if-exists, frameworks/native/build/tablet-10in-xhdpi-2048 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 \ - $(LOCAL_PATH)/init.db820c.power.rc:root/init.db820c.power.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 \ + $(LOCAL_PATH)/init.db820c.power.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.db820c.power.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 # Build generic Power HAL PRODUCT_PACKAGES += power.db820c diff --git a/device-common.mk b/device-common.mk index 0354d41..ddbe571 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 \ @@ -37,6 +40,9 @@ PRODUCT_PACKAGES := \ # Use Launcher3 PRODUCT_PACKAGES += Launcher3 +# Include vndk +PRODUCT_PACKAGES += vndk_package + # Enable WiFi PRODUCT_PACKAGES += \ android.hardware.wifi@1.0-service \ @@ -52,20 +58,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 \ @@ -118,12 +125,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/fstab.common b/fstab.common index 39f68a3..5ae2220 100644 --- a/fstab.common +++ b/fstab.common @@ -2,8 +2,6 @@ #<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags> # The filesystem that contains the filesystem checker binary (typically /system) cannot # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK -LABEL=system /system ext4 ro wait -LABEL=vendor /vendor ext4 ro wait LABEL=cache /cache ext4 discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait LABEL=data /data ext4 discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait # Ext sdcard on db820c diff --git a/init.common.rc b/init.common.rc index 8d181e0..511c213 100644 --- a/init.common.rc +++ b/init.common.rc @@ -2,8 +2,8 @@ import init.${ro.hardware}.usb.rc import init.${ro.hardware}.power.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)))) |