aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharlie-117 <gmoto1179@gmail.com>2020-09-17 16:15:50 +0530
committerCharlie-117 <gmoto1179@gmail.com>2020-09-17 16:15:50 +0530
commit79041c61f04da7c8567db89f24a82fa595f098ac (patch)
tree0b2a2b8905494c42cfa2d5ac8be95ecf0ea8ea14
parenta348172a53b182710064288c87675ec34c2c8bdc (diff)
merlin: AICP-ify
-rw-r--r--AndroidProducts.mk7
-rw-r--r--aicp.dependencies (renamed from lineage.dependencies)2
-rw-r--r--aicp_merlin.mk (renamed from lineage_merlin.mk)7
3 files changed, 11 insertions, 5 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index a75f6c2..4d1618b 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2018 The LineageOS Project
+# Copyright (C) 2020 Android Ice Cold Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +14,8 @@
# limitations under the License.
PRODUCT_MAKEFILES := \
- $(LOCAL_DIR)/lineage_merlin.mk
+ $(LOCAL_DIR)/aicp_merlin.mk
COMMON_LUNCH_CHOICES := \
- lineage_merlin-userdebug
+ aicp_merlin-userdebug
+ aicp_merlin-eng
diff --git a/lineage.dependencies b/aicp.dependencies
index 30b7919..5606a6f 100644
--- a/lineage.dependencies
+++ b/aicp.dependencies
@@ -1,6 +1,6 @@
[
{
- "repository": "android_device_motorola_msm8916-common",
+ "repository": "device_motorola_msm8916-common",
"target_path": "device/motorola/msm8916-common"
}
]
diff --git a/lineage_merlin.mk b/aicp_merlin.mk
index 3b1c203..96dfe53 100644
--- a/lineage_merlin.mk
+++ b/aicp_merlin.mk
@@ -1,5 +1,6 @@
# Copyright (C) 2015 The CyanogenMod Project
# (C) 2017 The LineageOS Project
+# (C) 2020 Android Ice Cold Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -22,7 +23,7 @@ TARGET_SCREEN_HEIGHT := 1280
## Device identifier. This must come after all inclusions
PRODUCT_DEVICE := merlin
-PRODUCT_NAME := lineage_merlin
+PRODUCT_NAME := aicp_merlin
PRODUCT_MODEL := MotoG3-TE
PRODUCT_BRAND := Motorola
PRODUCT_MANUFACTURER := Motorola
@@ -32,3 +33,7 @@ PRODUCT_BUILD_PROP_OVERRIDES += \
PRIVATE_BUILD_DESC="merlin_retail-user 6.0.1 MPD24.107-56 30 release-keys"
BUILD_FINGERPRINT := "motorola/merlin_retasia/merlin:6.0/MPD24.65-22/23:user/release-keys"
+
+# AICP Device Maintainer
+PRODUCT_BUILD_PROP_OVERRIDES += \
+ DEVICE_MAINTAINERS="Charlie (Charlie-117)"