summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrazorloves <razorloves@gmail.com>2019-01-28 06:20:10 -0600
committerrazorloves <razorloves@gmail.com>2019-03-01 01:17:33 -0600
commit9ba2f6f01157b574bf177cf2bf2b6a134a5dda92 (patch)
treeceb9ae82a70753a3f9a6ad7d6179452e508e5ab9
parent6521b8743338dc9c9e1dbab2fa6f2f51bf6810b4 (diff)
marlin: Add some missing packages and props
When building the vendor img, these were missing from the build. * Build libsensorndkbridge * Build liblibtinyxml * Build libmm-qcamera * Include verizon sepolicy * Build android.hardware.drm@1.1-service.clearkey * Add drm props Change-Id: I2ac172bdd58310cc8c8473545ff64df1a3074bc7
-rw-r--r--device-lineage.mk20
-rw-r--r--marlin/BoardConfig.mk2
-rw-r--r--sailfish/BoardConfig.mk2
3 files changed, 22 insertions, 2 deletions
diff --git a/device-lineage.mk b/device-lineage.mk
index af1e6cd2..95aa4136 100644
--- a/device-lineage.mk
+++ b/device-lineage.mk
@@ -1,3 +1,15 @@
+# Camera
+PRODUCT_PACKAGES += \
+ libmm-qcamera
+
+# DRM
+PRODUCT_PACKAGES += \
+ android.hardware.drm@1.1-service.clearkey
+
+PRODUCT_PROPERTY_OVERRIDES += \
+ drm.service.enabled=true \
+ media.mediadrmservice.enable=true
+
# Google Assistant
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += ro.opa.eligible_device=true
@@ -10,6 +22,14 @@ PRODUCT_PACKAGES += \
# Overlays
DEVICE_PACKAGE_OVERLAYS += device/google/marlin/overlay-lineage
+# Sensors
+PRODUCT_PACKAGES += \
+ libsensorndkbridge
+
# Theme
PRODUCT_PROPERTY_OVERRIDES += \
ro.boot.vendor.overlay.theme=org.lineageos.overlay.dark
+
+# Tool
+PRODUCT_PACKAGES += \
+ libtinyxml
diff --git a/marlin/BoardConfig.mk b/marlin/BoardConfig.mk
index 3e5e774b..4f015fdf 100644
--- a/marlin/BoardConfig.mk
+++ b/marlin/BoardConfig.mk
@@ -109,7 +109,7 @@ BOARD_ROOT_EXTRA_FOLDERS := firmware firmware/radio persist
BOARD_ROOT_EXTRA_SYMLINKS := /vendor/lib/dsp:/dsp
BOARD_SEPOLICY_DIRS += device/google/marlin/sepolicy
-ifneq ($(filter marlin marlinf, $(TARGET_PRODUCT)),)
+ifneq ($(filter lineage_marlin marlin marlinf, $(TARGET_PRODUCT)),)
BOARD_SEPOLICY_DIRS += device/google/marlin/sepolicy/verizon
endif
BOARD_PLAT_PRIVATE_SEPOLICY_DIR := device/google/marlin/sepolicy/private
diff --git a/sailfish/BoardConfig.mk b/sailfish/BoardConfig.mk
index f0973eb3..466c02d3 100644
--- a/sailfish/BoardConfig.mk
+++ b/sailfish/BoardConfig.mk
@@ -99,7 +99,7 @@ BOARD_ROOT_EXTRA_FOLDERS := firmware firmware/radio persist
BOARD_ROOT_EXTRA_SYMLINKS := /vendor/lib/dsp:/dsp
BOARD_SEPOLICY_DIRS += device/google/marlin/sepolicy
-ifneq ($(filter sailfish sailfishf, $(TARGET_PRODUCT)),)
+ifneq ($(filter lineage_sailfish sailfish sailfishf, $(TARGET_PRODUCT)),)
BOARD_SEPOLICY_DIRS += device/google/marlin/sepolicy/verizon
endif
BOARD_PLAT_PRIVATE_SEPOLICY_DIR := device/google/marlin/sepolicy/private