libra: AICPify

Change-Id: I13a9bfe07107a5324e2ad6a3a8a064366c5dbc07

5 files changed, 49 insertions, 42 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 41035662..f5e7acfd 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,6 +1,7 @@
 #
 # Copyright (C) 2015 The Android Open-Source Project
 # Copyright (C) 2017 The LineageOS Project
+# Copyright (C) 2017 The AICP Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/aicp.dependencies b/aicp.dependencies
new file mode 100644
index 00000000..32f75448
--- /dev/null
+++ b/aicp.dependencies
@@ -0,0 +1,17 @@
+[
+  {
+    "repository": "LineageOS/android_device_qcom_common",
+    "target_path": "device/qcom/common",
+    "branch": "lineage-15.0"
+  },
+    {
+    "repository": "AICP/proprietary_vendor_xiaomi",
+    "target_path": "vendor/xiaomi",
+    "branch": "o8.0"
+  },
+  {
+    "repository": "Demon000/kernel_xiaomi_libra",
+    "target_path": "kernel/xiaomi/msm8992",
+    "branch": "lineage-15.0"
+  }
+]
diff --git a/full_libra.mk b/aicp.mk
index 64915f25..7c61f9d2 100644
--- a/full_libra.mk
+++ b/aicp.mk
@@ -1,5 +1,6 @@
+
 #
-# Copyright (C) 2017 The LineageOS Project
+# Copyright 2017 The AICP Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,14 +19,38 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 
-# Inherit device configuration
+# Inherit from libra device
 $(call inherit-product, device/xiaomi/libra/device.mk)
 
-# Device identifier. This must come after all inclusions
-PRODUCT_NAME := full_libra
-PRODUCT_DEVICE := libra
+# Inherit some common AICP stuff.
+$(call inherit-product, vendor/aicp/config/common.mk)
+$(call inherit-product, vendor/aicp/config/common_full_phone.mk)
 
+# Set those variables here to overwrite the inherited values.
+BOARD_VENDOR := Xiaomi
 PRODUCT_BRAND := Xiaomi
-PRODUCT_MODEL := Mi-4c
+PRODUCT_DEVICE := libra
+PRODUCT_NAME := aicp_libra
 PRODUCT_MANUFACTURER := Xiaomi
 PRODUCT_RESTRICT_VENDOR_FILES := false
+PRODUCT_MODEL := Mi-4c
+TARGET_VENDOR := Xiaomi
+
+PRODUCT_GMS_CLIENTID_BASE := android-xiaomi
+
+# Boot animation
+TARGET_SCREEN_HEIGHT := 1920
+TARGET_SCREEN_WIDTH := 1080
+#-include vendor/aicp/config/bootanimation.mk
+
+# AICP Device Maintainers
+PRODUCT_BUILD_PROP_OVERRIDES += \
+    DEVICE_MAINTAINERS="Demon000 (Cosmin Tanislav) & csolanol (Carlos Solano)"
+
+# Fingerprint
+PRODUCT_BUILD_PROP_OVERRIDES += \
+    BUILD_FINGERPRINT="Xiaomi/libra/libra:7.0/NRD90M/V8.2.3.0.NXKCNEC:user/release-keys" \
+    PRIVATE_BUILD_DESC="libra-user 7.0 NRD90M V8.2.3.0.NXKCNEC release-keys"
+
+
+TARGET_OTA_ASSERT_DEVICE := libra
diff --git a/lineage.dependencies b/lineage.dependencies
deleted file mode 100644
index 38c8a3e4..00000000
--- a/lineage.dependencies
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "repository": "android_device_qcom_common",
-    "target_path": "device/qcom/common"
-  },
-  {
-    "repository": "android_kernel_xiaomi_msm8992",
-    "target_path": "kernel/xiaomi/msm8992"
-  }
-]
diff --git a/lineage.mk b/lineage.mk
deleted file mode 100644
index 643fb522..00000000
--- a/lineage.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright (C) 2016 The CyanogenMod Project
-#               2017 The LineageOS 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.
-#
-
-$(call inherit-product, device/xiaomi/libra/full_libra.mk)
-
-# Inherit some common LineageOS stuff.
-$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
-
-PRODUCT_NAME := lineage_libra
-BOARD_VENDOR := Xiaomi
-
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=libra