aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAayush Gupta <aayushgupta219@gmail.com>2021-03-20 06:43:47 +0000
committerJeferson Oliveira <jroliveira.oliveira301@gmail.com>2021-04-20 22:25:58 +0200
commitdb60cf5372ff23cff4626aac1c3a872fddcdbf94 (patch)
treeef3f44ced4e8029d66da5fe8f721897c11f6b31c
parent7859cc4b71c54fcf6607f78cf22af202b9ee1ada (diff)
lux: Make sure proprietary binaries exists before compilation
- Required to boot the OS - Work resolution while we are it Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com> Signed-off-by: althafvly <althafvly@gmail.com> Change-Id: Id478ed5b013488f1209f5944e08607180bc1a64a
-rw-r--r--BoardConfig.mk2
-rw-r--r--aicp_lux.mk6
-rw-r--r--device.mk6
-rw-r--r--full_lux.mk24
4 files changed, 9 insertions, 29 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 19369fd..43cb98b 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -29,7 +29,7 @@ TARGET_PROCESS_SDK_VERSION_OVERRIDE := \
/vendor/bin/mm-qcamera-daemon=25
# Display
-TARGET_SCREEN_DENSITY := 480
+TARGET_SCREEN_DENSITY := 420
# HIDL Manifest
DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml
diff --git a/aicp_lux.mk b/aicp_lux.mk
index e8291b8..5686632 100644
--- a/aicp_lux.mk
+++ b/aicp_lux.mk
@@ -13,11 +13,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$(call inherit-product, device/motorola/lux/full_lux.mk)
+$(call inherit-product, device/motorola/lux/device.mk)
# Boot animation
-TARGET_SCREEN_WIDTH := 1080
-TARGET_SCREEN_HEIGHT := 1920
+TARGET_SCREEN_WIDTH := 720
+TARGET_SCREEN_HEIGHT := 1280
TARGET_BOOTANIMATION_HALF_RES := true
## Device identifier. This must come after all inclusions
diff --git a/device.mk b/device.mk
index b7ba1d8..a31e339 100644
--- a/device.mk
+++ b/device.mk
@@ -19,7 +19,7 @@ $(call inherit-product, device/motorola/msm8916-common/msm8916.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_l_mr1.mk)
# Screen density
-PRODUCT_AAPT_PREF_CONFIG := xxhdpi
+PRODUCT_AAPT_PREF_CONFIG := xhdpi
# Audio
PRODUCT_COPY_FILES += \
@@ -89,3 +89,7 @@ PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += \
# Thermal
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/thermal-engine-lux.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-lux.conf
+
+# Get non-open-source specific aspects
+$(call inherit-product, vendor/motorola/lux/lux-vendor.mk)
+
diff --git a/full_lux.mk b/full_lux.mk
deleted file mode 100644
index 8e8da68..0000000
--- a/full_lux.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (C) 2015 The CyanogenMod Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Inherit from lux device
-$(call inherit-product, device/motorola/lux/device.mk)
-
-# Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := lux
-PRODUCT_NAME := full_lux
-
-$(call inherit-product-if-exists, vendor/motorola/lux/lux-vendor.mk)