b4s4: AICPify

Change-Id: I9f24d544599da1c9f0f3382f23a4261ca2668094

6 files changed, 30 insertions, 24 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 5681b064..8f49802f 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -19,11 +19,11 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_sargo.mk \
     $(LOCAL_DIR)/aosp_bonito_hwasan.mk \
     $(LOCAL_DIR)/aosp_sargo_hwasan.mk \
-    $(LOCAL_DIR)/lineage_bonito.mk \
-    $(LOCAL_DIR)/lineage_sargo.mk
+    $(LOCAL_DIR)/aicp_bonito.mk \
+    $(LOCAL_DIR)/aicp_sargo.mk
 
 COMMON_LUNCH_CHOICES := \
     aosp_bonito-userdebug \
     aosp_sargo-userdebug \
-    lineage_bonito-userdebug \
-    lineage_sargo-userdebug
+    aicp_bonito-userdebug \
+    aicp_sargo-userdebug
diff --git a/BoardConfigLineage.mk b/BoardConfigLineage.mk
index 2770f011..61d03f4b 100644
--- a/BoardConfigLineage.mk
+++ b/BoardConfigLineage.mk
@@ -18,7 +18,7 @@ TARGET_NEEDS_DTBOIMAGE := true
 
 # Manifests
 DEVICE_MANIFEST_FILE += device/google/bonito/lineage_manifest.xml
-DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += vendor/lineage/config/device_framework_matrix.xml
+DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += vendor/aicp/config/device_framework_matrix.xml
 
 # Partitions
 AB_OTA_PARTITIONS += \
@@ -29,7 +29,7 @@ endif
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 
 # Reserve space for gapps install
--include vendor/lineage/config/BoardConfigReservedSize.mk
+-include vendor/aicp/config/BoardConfigReservedSize.mk
 ifneq ($(WITH_GMS),true)
 BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE := 1069547520
 endif
diff --git a/aicp.dependencies b/aicp.dependencies
new file mode 100644
index 00000000..d63ba434
--- /dev/null
+++ b/aicp.dependencies
@@ -0,0 +1,20 @@
+[
+  {
+    "remote":      "aicp",
+    "repository":  "AICP/kernel_google_msm-4.9",
+    "target_path": "kernel/google/msm-4.9",
+    "branch":      "u14.0"
+  },
+  {
+    "remote":      "aicp",
+    "repository":  "LineageOS/android_packages_apps_ElmyraService",
+    "target_path": "packages/apps/ElmyraService",
+    "branch":      "lineage-21.0"
+  },
+  {
+    "remote":      "aicp",
+    "repository":  "LineageOS/android_device_google_gs-common",
+    "target_path": "device/google/gs-common",
+    "branch":      "lineage-21"
+  }
+]
diff --git a/lineage_bonito.mk b/aicp_bonito.mk
index 3cb8f916..73eb7cf4 100644
--- a/lineage_bonito.mk
+++ b/aicp_bonito.mk
@@ -5,7 +5,7 @@
 #
 
 # Inherit some common Lineage stuff.
-$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
+$(call inherit-product, vendor/aicp/config/common_full_phone.mk)
 
 # Inherit device configuration
 $(call inherit-product, device/google/bonito/aosp_bonito.mk)
@@ -15,7 +15,7 @@ include device/google/bonito/device-lineage.mk
 # Device identifier. This must come after all inclusions
 PRODUCT_BRAND := google
 PRODUCT_MODEL := Pixel 3a XL
-PRODUCT_NAME := lineage_bonito
+PRODUCT_NAME := aicp_bonito
 
 # Boot animation
 TARGET_SCREEN_HEIGHT := 2160
diff --git a/lineage_sargo.mk b/aicp_sargo.mk
index 419fa994..16274dbe 100644
--- a/lineage_sargo.mk
+++ b/aicp_sargo.mk
@@ -5,7 +5,7 @@
 #
 
 # Inherit some common Lineage stuff.
-$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
+$(call inherit-product, vendor/aicp/config/common_full_phone.mk)
 
 # Inherit device configuration
 $(call inherit-product, device/google/bonito/aosp_sargo.mk)
@@ -15,7 +15,7 @@ include device/google/bonito/device-lineage.mk
 # Device identifier. This must come after all inclusions
 PRODUCT_BRAND := google
 PRODUCT_MODEL := Pixel 3a
-PRODUCT_NAME := lineage_sargo
+PRODUCT_NAME := aicp_sargo
 
 # Boot animation
 TARGET_SCREEN_HEIGHT := 2220
diff --git a/lineage.dependencies b/lineage.dependencies
deleted file mode 100644
index 4141f979..00000000
--- a/lineage.dependencies
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-  {
-    "repository": "android_device_google_gs-common",
-    "target_path": "device/google/gs-common"
-  },
-  {
-    "repository": "android_kernel_google_msm-4.9",
-    "target_path": "kernel/google/msm-4.9"
-  },
-  {
-    "repository": "android_packages_apps_ElmyraService",
-    "target_path": "packages/apps/ElmyraService"
-  }
-]