summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2020-11-27 17:59:22 +0100
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2020-11-27 18:04:13 +0100
commitf71c064201c32ab1753f3cfe238db6a12b6b8aaf (patch)
treecac3d79d25bbcb2a7d9abbf0ed10d5b3c0b87eaa
parent997166e58d02bd7879da4e389e6d5af3490c679d (diff)
downloaddevice_samsung_midas_common-f71c064201c32ab1753f3cfe238db6a12b6b8aaf.tar.gz
device_samsung_midas_common-f71c064201c32ab1753f3cfe238db6a12b6b8aaf.tar.bz2
device_samsung_midas_common-f71c064201c32ab1753f3cfe238db6a12b6b8aaf.zip
midas.mk: sort sections alphabetically
This is to avoid potential duplication of sections. Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-rw-r--r--midas.mk224
1 files changed, 115 insertions, 109 deletions
diff --git a/midas.mk b/midas.mk
index 4d4cd2a..23b23cb 100644
--- a/midas.mk
+++ b/midas.mk
@@ -14,9 +14,64 @@
# limitations under the License.
#
+###############
+# ADB support #
+###############
+PRODUCT_PROPERTY_OVERRIDES += \
+ persist.service.adb.enable=1 \
+ persist.sys.usb.config=adb
+
+#########
+# Audio #
+#########
+
+PRODUCT_PACKAGES += \
+ android.hardware.audio.effect@6.0-impl \
+ android.hardware.audio@6.0-impl \
+ android.hardware.audio@2.0-service \
+ audio.r_submix.default \
+ audio.primary.default \
+
+# Use dummy sound trigger
+PRODUCT_PACKAGES += \
+ android.hardware.soundtrigger@2.2-impl \
+
+# A2DP
+PRODUCT_PACKAGES += \
+ audio.a2dp.default \
+
+PRODUCT_COPY_FILES += \
+ frameworks/av/media/libeffects/data/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
+ frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
+ frameworks/av/services/audiopolicy/config/primary_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/primary_audio_policy_configuration.xml \
+ frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
+ frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
+ frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
+ frameworks/av/services/audiopolicy/config/surround_sound_configuration_5_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/surround_sound_configuration_5_0.xml
+
+#########
+# Debug #
+#########
+
+# Get root on the serial console for -eng builds
+# This can help debugging early boot issues
+ifeq ($(TARGET_BUILD_VARIANT),eng)
+PRODUCT_COPY_FILES += $(LOCAL_PATH)/console.rc:system/etc/init/console.rc
+endif
+
+########################################
+# DRM (Digital Restriction Management) #
+########################################
+
+# TODO: check if this needs to be removed!
+PRODUCT_PACKAGES += \
+ android.hardware.drm@1.0-impl \
+ android.hardware.drm@1.0-service \
+
############
# Graphics #
############
+
PRODUCT_PACKAGES += \
gralloc.gbm \
hwcomposer.drm \
@@ -36,103 +91,97 @@ PRODUCT_AAPT_PREF_CONFIG := xhdpi
PRODUCT_COPY_FILES += $(LOCAL_PATH)/allocator/android.hardware.graphics.allocator@2.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.graphics.allocator@2.0-override-service.rc
+#########
+# Hacks #
+#########
+
+# HACK: prevent the device to go in suspend because it's annoying during early
+# development. Remove afterward as it consume way more energy this way.
+PRODUCT_COPY_FILES += $(LOCAL_PATH)/prevent_suspend.sh:system/bin/prevent_suspend.sh
+PRODUCT_COPY_FILES += $(LOCAL_PATH)/prevent_suspend.rc:system/etc/init/prevent_suspend.rc
+
##########
-# Lights #
+# Health #
##########
+
PRODUCT_PACKAGES += \
- android.hardware.light@2.0-service.samsung \
+ android.hardware.health@2.1-service \
+ android.hardware.health@2.1-impl \
-#######
-# USB #
-#######
+####################
+# Heimdall support #
+####################
-# HAL packages
-PRODUCT_PACKAGES += \
- android.hardware.usb@1.0-service
+# Enable flashing through heimdall
+PRODUCT_COPY_FILES += $(LOCAL_PATH)/resize2fs_partitions.sh:system/bin/resize2fs_partitions.sh
+
+##########
+# Kernel #
+##########
-# Enable Hardware compoments on the framework level
PRODUCT_COPY_FILES += \
- frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml
+ kernel/replicant/linux/zImage-dtb:kernel \
##########
-# Health #
+# Lights #
##########
+
PRODUCT_PACKAGES += \
- android.hardware.health@2.1-service \
- android.hardware.health@2.1-impl \
+ android.hardware.light@2.0-service.samsung \
-#########
-# Power #
-#########
+##########
+# Memory #
+##########
# HAL packages
PRODUCT_PACKAGES += \
- android.hardware.power-service.example \
-
-########
-# VNDK #
-########
-PRODUCT_PACKAGES += \
- vndk_package
+ android.hidl.memory@1.0-impl \
+ android.hidl.memory@1.0-service \
#########
-# Audio #
+# Power #
#########
-PRODUCT_PACKAGES += \
- android.hardware.audio.effect@6.0-impl \
- android.hardware.audio@6.0-impl \
- android.hardware.audio@2.0-service \
- audio.r_submix.default \
- audio.primary.default \
-# Use dummy sound trigger
+# HAL packages
PRODUCT_PACKAGES += \
- android.hardware.soundtrigger@2.2-impl \
+ android.hardware.power-service.example \
-# A2DP
+############
+# Security #
+############
+# Keymaster HAL packages
PRODUCT_PACKAGES += \
- audio.a2dp.default \
+ android.hardware.gatekeeper@1.0-service.software \
+ android.hardware.keymaster@3.0-impl \
+ android.hardware.keymaster@3.0-service \
-PRODUCT_COPY_FILES += \
- frameworks/av/media/libeffects/data/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
- frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
- frameworks/av/services/audiopolicy/config/primary_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/primary_audio_policy_configuration.xml \
- frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
- frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
- frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
- frameworks/av/services/audiopolicy/config/surround_sound_configuration_5_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/surround_sound_configuration_5_0.xml
+###########
+# Sensors #
+###########
-##########
-# Kernel #
-##########
-PRODUCT_COPY_FILES += \
- kernel/replicant/linux/zImage-dtb:kernel \
+# HAL packages
+PRODUCT_PACKAGES += \
+ android.hardware.sensors@1.0-impl \
###########################
-# unsupported HW features #
+# Unsupported HW features #
###########################
# Copy list of unsupported HW features
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/unsupported_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/unsupported_hardware.xml
-########################################
-# DRM (Digital Restriction Management) #
-########################################
+#######
+# USB #
+#######
-# TODO: check if this needs to be removed!
+# HAL packages
PRODUCT_PACKAGES += \
- android.hardware.drm@1.0-impl \
- android.hardware.drm@1.0-service \
+ android.hardware.usb@1.0-service
-############
-# Security #
-############
-# Keymaster HAL packages
-PRODUCT_PACKAGES += \
- android.hardware.gatekeeper@1.0-service.software \
- android.hardware.keymaster@3.0-impl \
- android.hardware.keymaster@3.0-service \
+# Enable Hardware compoments on the framework level
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml
############
# Vibrator #
@@ -142,22 +191,11 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
android.hardware.vibrator@1.0-impl \
-##########
-# Memory #
-##########
-
-# HAL packages
-PRODUCT_PACKAGES += \
- android.hidl.memory@1.0-impl \
- android.hidl.memory@1.0-service \
-
-###########
-# Sensors #
-###########
-
-# HAL packages
+########
+# VNDK #
+########
PRODUCT_PACKAGES += \
- android.hardware.sensors@1.0-impl \
+ vndk_package
######
# VR #
@@ -166,35 +204,3 @@ PRODUCT_PACKAGES += \
# HAL packages
PRODUCT_PACKAGES += \
android.hardware.vr@1.0-impl \
-#########
-# Debug #
-#########
-
-# Get root on the serial console for -eng builds
-# This can help debugging early boot issues
-ifeq ($(TARGET_BUILD_VARIANT),eng)
-PRODUCT_COPY_FILES += $(LOCAL_PATH)/console.rc:system/etc/init/console.rc
-endif
-
-###############
-# ADB support #
-###############
-PRODUCT_PROPERTY_OVERRIDES += \
- persist.service.adb.enable=1 \
- persist.sys.usb.config=adb
-
-####################
-# Heimdall support #
-####################
-
-# Enable flashing through heimdall
-PRODUCT_COPY_FILES += $(LOCAL_PATH)/resize2fs_partitions.sh:system/bin/resize2fs_partitions.sh
-
-#########
-# Hacks #
-#########
-
-# HACK: prevent the device to go in suspend because it's annoying during early
-# development. Remove afterward as it consume way more energy this way.
-PRODUCT_COPY_FILES += $(LOCAL_PATH)/prevent_suspend.sh:system/bin/prevent_suspend.sh
-PRODUCT_COPY_FILES += $(LOCAL_PATH)/prevent_suspend.rc:system/etc/init/prevent_suspend.rc