From 35872ba97535385fc974727787b8f8c28b9d57d0 Mon Sep 17 00:00:00 2001 From: therootlord Date: Sat, 22 Sep 2018 20:33:06 -0300 Subject: [PATCH] sanders: cleanup and reorganize --- BoardConfig.mk | 16 +++-- device.mk | 189 +++++++++++++++++++++++-------------------------- 2 files changed, 99 insertions(+), 106 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 3d956ec..09f2caf 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -205,6 +205,15 @@ BOARD_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/vendor # Thermal USE_DEVICE_SPECIFIC_THERMAL := true +# Treble +BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true +BOARD_VENDORIMAGE_PARTITION_SIZE := 805306368 +BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 +PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE := 27 +PRODUCT_FULL_TREBLE_OVERRIDE := true +PRODUCT_VENDOR_MOVE_ENABLED := true +TARGET_COPY_OUT_VENDOR := vendor + # Use mke2fs to create ext4 images TARGET_USES_MKE2FS := true @@ -220,10 +229,3 @@ WIFI_DRIVER_FW_PATH_AP := "ap" WIFI_DRIVER_FW_PATH_STA := "sta" WIFI_DRIVER_FW_PATH_P2P := "p2p" WPA_SUPPLICANT_VERSION := VER_0_8_X - -# Split selinux policy - -TARGET_COPY_OUT_VENDOR := vendor -BOARD_VENDORIMAGE_PARTITION_SIZE := 805306368 -BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 -BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true diff --git a/device.mk b/device.mk index 6fa23ae..1da624c 100644 --- a/device.mk +++ b/device.mk @@ -16,13 +16,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk) -# Properties +# Vendor properties -include device/motorola/sanders/vendor_prop.mk -# Overlay -DEVICE_PACKAGE_OVERLAYS += \ - $(LOCAL_PATH)/overlay - # These are the hardware-specific features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \ @@ -36,6 +32,7 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \ frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hce.xml \ frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml \ + frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml \ frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.accelerometer.xml \ frameworks/native/data/etc/android.hardware.sensor.compass.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.compass.xml \ frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.gyroscope.xml \ @@ -56,27 +53,22 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml \ frameworks/native/data/etc/android.software.print.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.print.xml \ frameworks/native/data/etc/android.software.sip.voip.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.sip.voip.xml \ - frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \ - frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml + frameworks/native/data/etc/com.android.nfc_extras.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.android.nfc_extras.xml \ + frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml # Screen density PRODUCT_AAPT_PREF_CONFIG := xxhdpi PRODUCT_AAPT_CONFIG := normal -# HIDL -PRODUCT_PACKAGES += \ - android.hidl.manager@1.0 \ - android.hidl.base@1.0 - # Audio PRODUCT_PACKAGES += \ + audiod \ audio.primary.msm8953 \ audio.a2dp.default \ - audio.usb.default \ audio.r_submix.default \ + audio.usb.default \ libaudio-resampler \ - libtinycompress \ - audiod + libtinycompress PRODUCT_PACKAGES += \ libqcomvisualizer \ @@ -86,19 +78,19 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ android.hardware.audio@2.0-impl \ - android.hardware.audio.effect@2.0-impl \ android.hardware.audio@2.0-service \ + android.hardware.audio.effect@2.0-impl \ android.hardware.audio.effect@2.0-service \ android.hardware.broadcastradio@1.0-impl PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/audio/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \ - $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - $(LOCAL_PATH)/audio/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \ + $(LOCAL_PATH)/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \ $(LOCAL_PATH)/audio/audio_platform_info_extcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_extcodec.xml \ + $(LOCAL_PATH)/audio/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \ + $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ $(LOCAL_PATH)/audio/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \ $(LOCAL_PATH)/audio/audio_ext_spkr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_ext_spkr.conf \ - $(LOCAL_PATH)/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \ $(LOCAL_PATH)/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \ $(LOCAL_PATH)/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml @@ -133,19 +125,6 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/camera/s5k4h8_chromatix.xml:$(TARGET_COPY_OUT_VENDOR)/etc/camera/s5k4h8_chromatix.xml \ $(LOCAL_PATH)/configs/camera/vfwconfig.json:$(TARGET_COPY_OUT_VENDOR)/etc/camera/vfwconfig.json -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/gps/etc/flp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/flp.conf \ - $(LOCAL_PATH)/gps/etc/gps.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gps.conf \ - $(LOCAL_PATH)/gps/etc/izat.conf:$(TARGET_COPY_OUT_VENDOR)/etc/izat.conf \ - $(LOCAL_PATH)/gps/etc/lowi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/lowi.conf \ - $(LOCAL_PATH)/gps/etc/sap.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sap.conf \ - $(LOCAL_PATH)/gps/etc/xtwifi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/xtwifi.conf \ - $(LOCAL_PATH)/gps/etc/cacert_location.pem:$(TARGET_COPY_OUT_VENDOR)/etc/cacert_location.pem - -# MotoActions -PRODUCT_PACKAGES += \ - MotoActions - # Display PRODUCT_PACKAGES += \ copybit.msm8953 \ @@ -164,18 +143,15 @@ PRODUCT_PACKAGES += \ libtinyxml \ libdisplayconfig \ libqdMetaData.system \ - vendor.display.config@1.0 \ - vendor.display.config@1.0_vendor + vendor.display.config@1.0 PRODUCT_PACKAGES += android.hardware.media.omx -# RenderScript HAL -PRODUCT_PACKAGES += \ - android.hardware.renderscript@1.0-impl - # DRM PRODUCT_PACKAGES += \ - libprotobuf-cpp-lite + android.hardware.drm@1.0-service \ + android.hardware.drm@1.0-impl \ + android.hardware.drm@1.0-service.widevine # limit dex2oat threads to improve thermals PRODUCT_PROPERTY_OVERRIDES += \ @@ -211,11 +187,41 @@ PRODUCT_PACKAGES += \ android.hardware.gnss@1.1-impl-qti \ android.hardware.gnss@1.1-service-qti +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/gps/etc/cacert_location.pem:$(TARGET_COPY_OUT_VENDOR)/etc/cacert_location.pem \ + $(LOCAL_PATH)/gps/etc/flp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/flp.conf \ + $(LOCAL_PATH)/gps/etc/gps.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gps.conf \ + $(LOCAL_PATH)/gps/etc/izat.conf:$(TARGET_COPY_OUT_VENDOR)/etc/izat.conf \ + $(LOCAL_PATH)/gps/etc/lowi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/lowi.conf \ + $(LOCAL_PATH)/gps/etc/sap.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sap.conf \ + $(LOCAL_PATH)/gps/etc/xtwifi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/xtwifi.conf + # health PRODUCT_PACKAGES += \ android.hardware.health@2.0-impl \ android.hardware.health@2.0-service +# HIDL +PRODUCT_PACKAGES += \ + android.hidl.base@1.0 \ + android.hidl.manager@1.0 + +# IDC +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/idc/uinput-fpc.idc:system/usr/idc/uinput-fpc.idc + +# IMS +PRODUCT_PACKAGES += \ + ims-ext-common \ + telephony-ext + +PRODUCT_BOOT_JARS += \ + telephony-ext + +# IMS +PRODUCT_PACKAGES += \ + com.android.ims.rcsmanager + # IRSC PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/sec_config:$(TARGET_COPY_OUT_VENDOR)/etc/sec_config @@ -231,11 +237,8 @@ PRODUCT_COPY_FILES += \ # Keymaster HAL PRODUCT_PACKAGES += \ - android.hardware.keymaster@3.0-impl \ - android.hardware.keymaster@3.0-service -# IDC -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/idc/uinput-fpc.idc:system/usr/idc/uinput-fpc.idc + android.hardware.keymaster@3.0-impl \ + android.hardware.keymaster@3.0-service # Lights PRODUCT_PACKAGES += \ @@ -243,12 +246,6 @@ PRODUCT_PACKAGES += \ android.hardware.light@2.0-service \ lights.msm8953 -# DRM -PRODUCT_PACKAGES += \ - android.hardware.drm@1.0-service \ - android.hardware.drm@1.0-impl \ - android.hardware.drm@1.0-service.widevine - # Media PRODUCT_PACKAGES += \ libc2dcolorconvert @@ -258,36 +255,36 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ $(LOCAL_PATH)/configs/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml \ $(LOCAL_PATH)/configs/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \ - $(LOCAL_PATH)/configs/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \ + $(LOCAL_PATH)/configs/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml PRODUCT_COPY_FILES += \ frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \ frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \ frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml -# NFC -PRODUCT_COPY_FILES += \ - frameworks/base/nfc-extras/com.android.nfc_extras.xml:system/etc/permissions/com.android.nfc_extras.xml - -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/libnfc-nci.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nci.conf \ - $(LOCAL_PATH)/configs/libnfc-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf +# MotoActions +PRODUCT_PACKAGES += \ + MotoActions # Netutils PRODUCT_PACKAGES += \ android.system.net.netd@1.0 \ - netutils-wrapper-1.0 \ libandroid_net \ - libandroid_net_32 + libandroid_net_32 \ + netutils-wrapper-1.0 +# NFC PRODUCT_PACKAGES += \ android.hardware.nfc@1.1-service \ + com.android.nfc_extras \ libnfc \ NfcNci \ SecureElement \ - Tag \ - TagGoogle \ - com.android.nfc_extras + Tag + +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/configs/libnfc-nci.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nci.conf \ + $(LOCAL_PATH)/configs/libnfc-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf # OMX PRODUCT_PACKAGES += \ @@ -301,10 +298,19 @@ PRODUCT_PACKAGES += \ libOmxVidcCommon \ libstagefrighthw +# Overlay +DEVICE_PACKAGE_OVERLAYS += \ + $(LOCAL_PATH)/overlay + # Power PRODUCT_PACKAGES += \ android.hardware.power@1.0-service-qti +# Powerhint configuration file +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/configs/powerhint.xml:system/etc/powerhint.xml \ + $(LOCAL_PATH)/configs/perfboostsconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perfboostsconfig.xml + # Qualcomm PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/privapp-permissions-oem.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/privapp-permissions-oem.xml \ @@ -325,19 +331,26 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/rootdir/etc/ueventd.qcom.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc -# Powerhint configuration file -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/powerhint.xml:system/etc/powerhint.xml \ - $(LOCAL_PATH)/configs/perfboostsconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perfboostsconfig.xml +# RCS +PRODUCT_PACKAGES += \ + rcs_service_aidl \ + rcs_service_aidl.xml \ + rcs_service_api \ + rcs_service_api.xml # Releasetools script PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/check_features.sh:$(TARGET_COPY_OUT_VENDOR)/bin/check_features.sh +# RenderScript HAL +PRODUCT_PACKAGES += \ + android.hardware.renderscript@1.0-impl + # RIL PRODUCT_PACKAGES += \ librmnetctl \ libprotobuf-cpp-full \ + libprotobuf-cpp-lite \ libxml2 #RIL @@ -349,28 +362,21 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/seccomp_policy/mediacodec.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \ $(LOCAL_PATH)/seccomp_policy/mediaextractor.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediaextractor.policy -# IMS -PRODUCT_PACKAGES += \ - ims-ext-common \ - telephony-ext - -PRODUCT_BOOT_JARS += \ - telephony-ext - -# IMS -PRODUCT_PACKAGES += \ -com.android.ims.rcsmanager - # Sensors -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf \ - $(LOCAL_PATH)/configs/sensors/sensor_def_qcomdev.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/sensor_def_qcomdev.conf - PRODUCT_PACKAGES += \ android.hardware.sensors@1.0-impl \ android.hardware.sensors@1.0-service +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/configs/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf \ + $(LOCAL_PATH)/configs/sensors/sensor_def_qcomdev.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/sensor_def_qcomdev.conf + # Thermal +PRODUCT_PACKAGES += \ + android.hardware.thermal@1.0-impl \ + android.hardware.thermal@1.0-service \ + thermal.msm8953 + PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/thermal-engine-sanders.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine.conf @@ -383,16 +389,10 @@ PRODUCT_PACKAGES += \ android.hardware.vibrator@1.0-impl \ android.hardware.vibrator@1.0-service +# VNDK PRODUCT_PACKAGES += \ vndk-sp -# RCS -PRODUCT_PACKAGES += \ - rcs_service_aidl \ - rcs_service_aidl.xml \ - rcs_service_api \ - rcs_service_api.xml - # Wifi PRODUCT_PACKAGES += \ android.hardware.wifi@1.0-service \ @@ -405,11 +405,6 @@ PRODUCT_PACKAGES += \ wpa_supplicant \ wpa_supplicant.conf -#Thermal -PRODUCT_PACKAGES += android.hardware.thermal@1.0-impl \ - android.hardware.thermal@1.0-service \ - thermal.msm8953 - PRODUCT_PACKAGES += \ libcurl \ libQWiFiSoftApCfg \ @@ -438,7 +433,3 @@ PRODUCT_COPY_FILES += \ PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0 PRODUCT_GMS_CLIENTID_BASE := android-motorola - -PRODUCT_VENDOR_MOVE_ENABLED := true -PRODUCT_FULL_TREBLE_OVERRIDE := true -PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE := 27