aicp: sed vendor/lineage and tools-lineage

Change-Id: I424b7b7d85b1509229354afe29efc433a500f82a

56 files changed, 118 insertions, 118 deletions

diff --git a/build/core/config.mk b/build/core/config.mk
index 2359371dc..394ffb939 100644
--- a/build/core/config.mk
+++ b/build/core/config.mk
@@ -14,4 +14,4 @@
 # limitations under the License.
 
 # Rules for QCOM targets
-include $(TOPDIR)vendor/lineage/build/core/qcom_target.mk
+include $(TOPDIR)vendor/aicp/build/core/qcom_target.mk
diff --git a/build/core/definitions.mk b/build/core/definitions.mk
index 4eecee627..bf6c05c2a 100644
--- a/build/core/definitions.mk
+++ b/build/core/definitions.mk
@@ -6,7 +6,7 @@ $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
 endef
 
 # Include board/platform macros
-include vendor/lineage/build/core/utils.mk
+include vendor/aicp/build/core/utils.mk
 
 # Include default installed modules
-include vendor/lineage/build/core/default_installed_modules.mk
+include vendor/aicp/build/core/default_installed_modules.mk
diff --git a/build/envsetup.sh b/build/envsetup.sh
index 8b8cf7c42..6f29163ea 100644
--- a/build/envsetup.sh
+++ b/build/envsetup.sh
@@ -44,7 +44,7 @@ function breakfast()
 {
     target=$1
     local variant=$2
-    source ${ANDROID_BUILD_TOP}/vendor/lineage/vars/aosp_target_release
+    source ${ANDROID_BUILD_TOP}/vendor/aicp/vars/aosp_target_release
 
     if [ $# -eq 0 ]; then
         # No arguments, so let's have the full menu
@@ -903,7 +903,7 @@ alias cmkap='dopush cmka'
 
 function repopick() {
     T=$(gettop)
-    $T/vendor/lineage/build/tools/repopick.py $@
+    $T/vendor/aicp/build/tools/repopick.py $@
 }
 
 function sort-blobs-list() {
diff --git a/build/soong/Android.bp b/build/soong/Android.bp
index a36954b3c..46c9c6364 100644
--- a/build/soong/Android.bp
+++ b/build/soong/Android.bp
@@ -30,7 +30,7 @@ lineage_generator {
          "else " +
          "    $(PATH_OVERRIDE_SOONG) $(KERNEL_MAKE_CMD) $(KERNEL_MAKE_FLAGS) -C $(TARGET_KERNEL_SOURCE) O=$(KERNEL_BUILD_OUT_PREFIX)$(genDir) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) headers_install; " +
          "fi; " +
-         "vendor/lineage/tools/clean_headers.sh $(KERNEL_BUILD_OUT_PREFIX)$(genDir)",
+         "vendor/aicp/tools/clean_headers.sh $(KERNEL_BUILD_OUT_PREFIX)$(genDir)",
 
     // Directories that can be imported by a cc_* module generated_headers property
     export_include_dirs: [
@@ -55,7 +55,7 @@ lineage_generator {
     name: "prebuilt_kernel_includes",
 
     // The headers extract command
-    cmd: "mkdir -p $(KERNEL_BUILD_OUT_PREFIX)$(genDir) && gzip -d < $(TARGET_PREBUILT_KERNEL_HEADERS) | tar -x -C $(KERNEL_BUILD_OUT_PREFIX)$(genDir) && vendor/lineage/tools/clean_headers.sh $(KERNEL_BUILD_OUT_PREFIX)$(genDir)",
+    cmd: "mkdir -p $(KERNEL_BUILD_OUT_PREFIX)$(genDir) && gzip -d < $(TARGET_PREBUILT_KERNEL_HEADERS) | tar -x -C $(KERNEL_BUILD_OUT_PREFIX)$(genDir) && vendor/aicp/tools/clean_headers.sh $(KERNEL_BUILD_OUT_PREFIX)$(genDir)",
 
     // Directories that can be imported by a cc_* module generated_headers property
     export_include_dirs: [
diff --git a/build/soong/mkdir/mkdir.go b/build/soong/mkdir/mkdir.go
index 79663ce1a..938e34d1c 100644
--- a/build/soong/mkdir/mkdir.go
+++ b/build/soong/mkdir/mkdir.go
@@ -58,7 +58,7 @@ func (this *Mkdir) AndroidMkEntries() []android.AndroidMkEntries {
 		Class: "FAKE",
 		// Need at least one output file in order for this to take effect.
 		OutputFile: android.OptionalPathForPath(this.output),
-		Include: "vendor/lineage/build/core/mkdir.mk",
+		Include: "vendor/aicp/build/core/mkdir.mk",
 		ExtraEntries: []android.AndroidMkExtraEntriesFunc{
 			func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
 				entries.SetString("LOCAL_SOONG_INSTALL_DIR", this.installDir.String())
diff --git a/build/target/product/lineage_cf_car_arm64.mk b/build/target/product/lineage_cf_car_arm64.mk
index c90ecd34a..5aae3ce8d 100644
--- a/build/target/product/lineage_cf_car_arm64.mk
+++ b/build/target/product/lineage_cf_car_arm64.mk
@@ -3,7 +3,7 @@
 
 $(call inherit-product, device/google/cuttlefish/vsoc_arm64_only/auto/aosp_cf.mk)
 
-include vendor/lineage/build/target/product/lineage_generic_car_target.mk
+include vendor/aicp/build/target/product/lineage_generic_car_target.mk
 
 TARGET_DISABLE_EPPE := true
 TARGET_NO_KERNEL_OVERRIDE := true
diff --git a/build/target/product/lineage_cf_car_x86_64.mk b/build/target/product/lineage_cf_car_x86_64.mk
index 22913fd05..61aa9e0c1 100644
--- a/build/target/product/lineage_cf_car_x86_64.mk
+++ b/build/target/product/lineage_cf_car_x86_64.mk
@@ -3,7 +3,7 @@
 
 $(call inherit-product, device/google/cuttlefish/vsoc_x86_64_only/auto/aosp_cf.mk)
 
-include vendor/lineage/build/target/product/lineage_generic_car_target.mk
+include vendor/aicp/build/target/product/lineage_generic_car_target.mk
 
 TARGET_DISABLE_EPPE := true
 TARGET_NO_KERNEL_OVERRIDE := true
diff --git a/build/target/product/lineage_cf_phone_arm64.mk b/build/target/product/lineage_cf_phone_arm64.mk
index db41a23f8..4a72fa594 100644
--- a/build/target/product/lineage_cf_phone_arm64.mk
+++ b/build/target/product/lineage_cf_phone_arm64.mk
@@ -3,7 +3,7 @@
 
 $(call inherit-product, device/google/cuttlefish/vsoc_arm64/phone/aosp_cf.mk)
 
-include vendor/lineage/build/target/product/lineage_generic_target.mk
+include vendor/aicp/build/target/product/lineage_generic_target.mk
 
 TARGET_DISABLE_EPPE := true
 TARGET_NO_KERNEL_OVERRIDE := true
diff --git a/build/target/product/lineage_cf_phone_x86_64.mk b/build/target/product/lineage_cf_phone_x86_64.mk
index e35242bc1..bd09e4814 100644
--- a/build/target/product/lineage_cf_phone_x86_64.mk
+++ b/build/target/product/lineage_cf_phone_x86_64.mk
@@ -3,7 +3,7 @@
 
 $(call inherit-product, device/google/cuttlefish/vsoc_x86_64/phone/aosp_cf.mk)
 
-include vendor/lineage/build/target/product/lineage_generic_target.mk
+include vendor/aicp/build/target/product/lineage_generic_target.mk
 
 TARGET_DISABLE_EPPE := true
 TARGET_NO_KERNEL_OVERRIDE := true
diff --git a/build/target/product/lineage_cf_tv_x86_64.mk b/build/target/product/lineage_cf_tv_x86_64.mk
index a6b91dee1..537205d8b 100644
--- a/build/target/product/lineage_cf_tv_x86_64.mk
+++ b/build/target/product/lineage_cf_tv_x86_64.mk
@@ -3,7 +3,7 @@
 
 $(call inherit-product, device/google/cuttlefish/vsoc_x86_64/tv/aosp_cf.mk)
 
-include vendor/lineage/build/target/product/lineage_generic_tv_target.mk
+include vendor/aicp/build/target/product/lineage_generic_tv_target.mk
 
 TARGET_DISABLE_EPPE := true
 TARGET_NO_KERNEL_OVERRIDE := true
diff --git a/build/target/product/lineage_generic_car_target.mk b/build/target/product/lineage_generic_car_target.mk
index 82db1329c..4b2885b13 100644
--- a/build/target/product/lineage_generic_car_target.mk
+++ b/build/target/product/lineage_generic_car_target.mk
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-$(call inherit-product, vendor/lineage/config/common_car.mk)
+$(call inherit-product, vendor/aicp/config/common_car.mk)
 
 EMULATOR_VENDOR_NO_SENSORS := true
 EMULATOR_VENDOR_NO_SOUND := true
diff --git a/build/target/product/lineage_generic_target.mk b/build/target/product/lineage_generic_target.mk
index 69fe18e7e..82e34ad7a 100644
--- a/build/target/product/lineage_generic_target.mk
+++ b/build/target/product/lineage_generic_target.mk
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
+$(call inherit-product, vendor/aicp/config/common_full_phone.mk)
 
 # Allow building otatools
 TARGET_FORCE_OTA_PACKAGE := true
diff --git a/build/target/product/lineage_generic_tv_target.mk b/build/target/product/lineage_generic_tv_target.mk
index 9ad531e38..e51bb40a5 100644
--- a/build/target/product/lineage_generic_tv_target.mk
+++ b/build/target/product/lineage_generic_tv_target.mk
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 $(call inherit-product, device/google/atv/products/atv_base.mk)
-$(call inherit-product, vendor/lineage/config/common_full_tv.mk)
+$(call inherit-product, vendor/aicp/config/common_full_tv.mk)
 
 # Allow building otatools
 TARGET_FORCE_OTA_PACKAGE := true
diff --git a/build/target/product/lineage_gsi_arm.mk b/build/target/product/lineage_gsi_arm.mk
index bf414e2c0..25fbe75d3 100644
--- a/build/target/product/lineage_gsi_arm.mk
+++ b/build/target/product/lineage_gsi_arm.mk
@@ -16,7 +16,7 @@ $(call inherit-product, device/generic/common/gsi_arm.mk)
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 
-include vendor/lineage/build/target/product/lineage_generic_target.mk
+include vendor/aicp/build/target/product/lineage_generic_target.mk
 
 PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
 
diff --git a/build/target/product/lineage_gsi_arm64.mk b/build/target/product/lineage_gsi_arm64.mk
index d9aa4a6e2..32541fcef 100644
--- a/build/target/product/lineage_gsi_arm64.mk
+++ b/build/target/product/lineage_gsi_arm64.mk
@@ -16,7 +16,7 @@ $(call inherit-product, device/generic/common/gsi_arm64.mk)
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 
-include vendor/lineage/build/target/product/lineage_generic_target.mk
+include vendor/aicp/build/target/product/lineage_generic_target.mk
 
 PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
 
diff --git a/build/target/product/lineage_gsi_car_arm64.mk b/build/target/product/lineage_gsi_car_arm64.mk
index 3d0ec8194..d79ca6cdf 100644
--- a/build/target/product/lineage_gsi_car_arm64.mk
+++ b/build/target/product/lineage_gsi_car_arm64.mk
@@ -14,7 +14,7 @@
 
 $(call inherit-product, device/generic/car/gsi_car_arm64.mk)
 
-include vendor/lineage/build/target/product/lineage_generic_car_target.mk
+include vendor/aicp/build/target/product/lineage_generic_car_target.mk
 
 PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
 
diff --git a/build/target/product/lineage_gsi_car_x86_64.mk b/build/target/product/lineage_gsi_car_x86_64.mk
index 17adadfec..06708353e 100644
--- a/build/target/product/lineage_gsi_car_x86_64.mk
+++ b/build/target/product/lineage_gsi_car_x86_64.mk
@@ -14,7 +14,7 @@
 
 $(call inherit-product, device/generic/car/gsi_car_x86_64.mk)
 
-include vendor/lineage/build/target/product/lineage_generic_car_target.mk
+include vendor/aicp/build/target/product/lineage_generic_car_target.mk
 
 PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
 
diff --git a/build/target/product/lineage_gsi_tv_arm.mk b/build/target/product/lineage_gsi_tv_arm.mk
index c9d2495ba..3b4709343 100644
--- a/build/target/product/lineage_gsi_tv_arm.mk
+++ b/build/target/product/lineage_gsi_tv_arm.mk
@@ -15,7 +15,7 @@
 $(call inherit-product, build/target/product/gsi_release.mk)
 $(call inherit-product, device/google/atv/products/aosp_tv_arm.mk)
 
-include vendor/lineage/build/target/product/lineage_generic_tv_target.mk
+include vendor/aicp/build/target/product/lineage_generic_tv_target.mk
 
 TARGET_NO_KERNEL_OVERRIDE := true
 
diff --git a/build/target/product/lineage_gsi_tv_arm64.mk b/build/target/product/lineage_gsi_tv_arm64.mk
index 7242b9216..f59ba1dc4 100644
--- a/build/target/product/lineage_gsi_tv_arm64.mk
+++ b/build/target/product/lineage_gsi_tv_arm64.mk
@@ -15,7 +15,7 @@
 $(call inherit-product, build/target/product/gsi_release.mk)
 $(call inherit-product, device/google/atv/products/aosp_tv_arm64.mk)
 
-include vendor/lineage/build/target/product/lineage_generic_tv_target.mk
+include vendor/aicp/build/target/product/lineage_generic_tv_target.mk
 
 TARGET_NO_KERNEL_OVERRIDE := true
 
diff --git a/build/target/product/lineage_gsi_tv_x86.mk b/build/target/product/lineage_gsi_tv_x86.mk
index d918a45ca..2b44771dd 100644
--- a/build/target/product/lineage_gsi_tv_x86.mk
+++ b/build/target/product/lineage_gsi_tv_x86.mk
@@ -14,7 +14,7 @@
 
 $(call inherit-product, device/google/atv/products/aosp_tv_x86.mk)
 
-include vendor/lineage/build/target/product/lineage_generic_tv_target.mk
+include vendor/aicp/build/target/product/lineage_generic_tv_target.mk
 
 PRODUCT_NAME := lineage_gsi_tv_x86
 
diff --git a/build/target/product/lineage_gsi_tv_x86_64.mk b/build/target/product/lineage_gsi_tv_x86_64.mk
index 39f3b00ae..6466a83d8 100644
--- a/build/target/product/lineage_gsi_tv_x86_64.mk
+++ b/build/target/product/lineage_gsi_tv_x86_64.mk
@@ -14,7 +14,7 @@
 
 $(call inherit-product, device/google/atv/products/aosp_tv_x86_64.mk)
 
-include vendor/lineage/build/target/product/lineage_generic_tv_target.mk
+include vendor/aicp/build/target/product/lineage_generic_tv_target.mk
 
 TARGET_SUPPORTS_64_BIT_APPS := true
 
diff --git a/build/target/product/lineage_gsi_x86.mk b/build/target/product/lineage_gsi_x86.mk
index 91637ff75..72896636f 100644
--- a/build/target/product/lineage_gsi_x86.mk
+++ b/build/target/product/lineage_gsi_x86.mk
@@ -14,7 +14,7 @@
 
 $(call inherit-product, device/generic/common/gsi_x86.mk)
 
-include vendor/lineage/build/target/product/lineage_generic_target.mk
+include vendor/aicp/build/target/product/lineage_generic_target.mk
 
 PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
 
diff --git a/build/target/product/lineage_gsi_x86_64.mk b/build/target/product/lineage_gsi_x86_64.mk
index 4c99bfb27..f0cf26623 100644
--- a/build/target/product/lineage_gsi_x86_64.mk
+++ b/build/target/product/lineage_gsi_x86_64.mk
@@ -14,7 +14,7 @@
 
 $(call inherit-product, device/generic/common/gsi_x86_64.mk)
 
-include vendor/lineage/build/target/product/lineage_generic_target.mk
+include vendor/aicp/build/target/product/lineage_generic_target.mk
 
 PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
 
diff --git a/build/target/product/lineage_sdk_car_arm64.mk b/build/target/product/lineage_sdk_car_arm64.mk
index d04c43781..1e0a358e7 100644
--- a/build/target/product/lineage_sdk_car_arm64.mk
+++ b/build/target/product/lineage_sdk_car_arm64.mk
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include vendor/lineage/build/target/product/lineage_generic_car_target.mk
+include vendor/aicp/build/target/product/lineage_generic_car_target.mk
 
 $(call inherit-product, device/generic/car/emulator/aosp_car_emulator.mk)
 
diff --git a/build/target/product/lineage_sdk_car_x86_64.mk b/build/target/product/lineage_sdk_car_x86_64.mk
index e3ed797b2..53d5e7c57 100644
--- a/build/target/product/lineage_sdk_car_x86_64.mk
+++ b/build/target/product/lineage_sdk_car_x86_64.mk
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include vendor/lineage/build/target/product/lineage_generic_car_target.mk
+include vendor/aicp/build/target/product/lineage_generic_car_target.mk
 
 $(call inherit-product, device/generic/car/emulator/aosp_car_emulator.mk)
 
diff --git a/build/target/product/lineage_sdk_phone_arm64.mk b/build/target/product/lineage_sdk_phone_arm64.mk
index a1f5afa84..8075bbf09 100644
--- a/build/target/product/lineage_sdk_phone_arm64.mk
+++ b/build/target/product/lineage_sdk_phone_arm64.mk
@@ -13,9 +13,9 @@
 # limitations under the License.
 
 $(call inherit-product, device/generic/goldfish/64bitonly/product/sdk_phone64_arm64.mk)
-$(call inherit-product, vendor/lineage/build/target/product/lineage_sdk_phone_arm64_board.mk)
+$(call inherit-product, vendor/aicp/build/target/product/lineage_sdk_phone_arm64_board.mk)
 
-include vendor/lineage/build/target/product/lineage_generic_target.mk
+include vendor/aicp/build/target/product/lineage_generic_target.mk
 
 # Always build modules from source
 PRODUCT_MODULE_BUILD_FROM_SOURCE := true
@@ -28,4 +28,4 @@ PRODUCT_NAME := lineage_sdk_phone_arm64
 PRODUCT_MODEL := LineageOS Android SDK built for arm64
 
 PRODUCT_SDK_ADDON_NAME := lineage
-PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := vendor/lineage/build/target/product/source.properties
+PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := vendor/aicp/build/target/product/source.properties
diff --git a/build/target/product/lineage_sdk_phone_x86_64.mk b/build/target/product/lineage_sdk_phone_x86_64.mk
index 59fe59d4b..ebd73b92a 100644
--- a/build/target/product/lineage_sdk_phone_x86_64.mk
+++ b/build/target/product/lineage_sdk_phone_x86_64.mk
@@ -14,7 +14,7 @@
 
 $(call inherit-product, device/generic/goldfish/64bitonly/product/sdk_phone64_x86_64.mk)
 
-include vendor/lineage/build/target/product/lineage_generic_target.mk
+include vendor/aicp/build/target/product/lineage_generic_target.mk
 include device/generic/goldfish/board/kernel/x86_64.mk
 
 # Always build modules from source
diff --git a/build/target/product/lineage_sdk_tv_arm.mk b/build/target/product/lineage_sdk_tv_arm.mk
index 576a4fdb1..edb2f5833 100644
--- a/build/target/product/lineage_sdk_tv_arm.mk
+++ b/build/target/product/lineage_sdk_tv_arm.mk
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include vendor/lineage/build/target/product/lineage_generic_tv_target.mk
+include vendor/aicp/build/target/product/lineage_generic_tv_target.mk
 
 $(call inherit-product, device/google/atv/products/sdk_atv_armv7.mk)
 
diff --git a/build/target/product/lineage_sdk_tv_x86.mk b/build/target/product/lineage_sdk_tv_x86.mk
index 616fab08d..eec1bc9b2 100644
--- a/build/target/product/lineage_sdk_tv_x86.mk
+++ b/build/target/product/lineage_sdk_tv_x86.mk
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include vendor/lineage/build/target/product/lineage_generic_tv_target.mk
+include vendor/aicp/build/target/product/lineage_generic_tv_target.mk
 
 $(call inherit-product, device/google/atv/products/sdk_atv_x86.mk)
 
diff --git a/build/target/product/lineage_sdk_tv_x86_64.mk b/build/target/product/lineage_sdk_tv_x86_64.mk
index 5e26a2847..d4787d337 100644
--- a/build/target/product/lineage_sdk_tv_x86_64.mk
+++ b/build/target/product/lineage_sdk_tv_x86_64.mk
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include vendor/lineage/build/target/product/lineage_generic_tv_target.mk
+include vendor/aicp/build/target/product/lineage_generic_tv_target.mk
 
 $(call inherit-product, device/google/atv/products/sdk_atv64_x86_64.mk)
 
diff --git a/build/tasks/dt_image.mk b/build/tasks/dt_image.mk
index 213341741..b38b0ced8 100644
--- a/build/tasks/dt_image.mk
+++ b/build/tasks/dt_image.mk
@@ -42,7 +42,7 @@ endif
 $(INSTALLED_DTIMAGE_TARGET): $(DTBTOOL) $(INSTALLED_KERNEL_TARGET)
 	$(build-dtimage-target)
 ifeq ($(strip $(BOARD_KERNEL_LZ4C_DT)),true)
-	prebuilts/tools-lineage/${HOST_OS}-x86/bin/lz4 -9 < $@ > $(LZ4_DT_IMAGE)
+	prebuilts/tools-aicp/${HOST_OS}-x86/bin/lz4 -9 < $@ > $(LZ4_DT_IMAGE)
 	$(hide) $(ACP) $(LZ4_DT_IMAGE) $@
 endif
 	@echo "Made DT image: $@"
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index 3f736c31c..8729ad49d 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -673,7 +673,7 @@ ifeq ($(BOARD_USES_QCOM_MERGE_DTBS_SCRIPT),true)
 	$(hide) find $(DTBS_BASE) -type f -name "*.dtb*" | xargs rm -f
 	$(hide) find $(DTBS_OUT) -type f -name "*.dtb*" | xargs rm -f
 	mv $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts/vendor/*/*.dtb $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts/vendor/*/*.dtbo $(DTBS_BASE)/
-	PATH=$(abspath $(HOST_OUT_EXECUTABLES)):$${PATH} python3 $(BUILD_TOP)/vendor/lineage/build/tools/merge_dtbs.py --base $(DTBS_BASE) --techpack $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts/vendor/qcom --out $(DTBS_OUT)
+	PATH=$(abspath $(HOST_OUT_EXECUTABLES)):$${PATH} python3 $(BUILD_TOP)/vendor/aicp/build/tools/merge_dtbs.py --base $(DTBS_BASE) --techpack $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts/vendor/qcom --out $(DTBS_OUT)
 	cat $(shell find $(DTBS_OUT) -type f -name "${TARGET_MERGE_DTBS_WILDCARD}.dtb" | sort) > $@
 else
 	@rm -f $@
diff --git a/config/BoardConfigKernel.mk b/config/BoardConfigKernel.mk
index 9b01f03f2..8be4cdb1a 100644
--- a/config/BoardConfigKernel.mk
+++ b/config/BoardConfigKernel.mk
@@ -60,7 +60,7 @@
 #                                          is in PATH
 #   USE_CCACHE                         = Enable ccache (global Android flag)
 
-include vendor/lineage/build/core/utils.mk
+include vendor/aicp/build/core/utils.mk
 
 BUILD_TOP := $(abspath .)
 
@@ -120,7 +120,7 @@ KERNEL_MAKE_FLAGS :=
 KERNEL_MAKE_FLAGS += -j$(shell getconf _NPROCESSORS_ONLN)
 
 TOOLS_PATH_OVERRIDE := \
-    HIP_PATH=none PERL5LIB=$(BUILD_TOP)/prebuilts/tools-lineage/common/perl-base
+    HIP_PATH=none PERL5LIB=$(BUILD_TOP)/prebuilts/tools-aicp/common/perl-base
 
 ifneq ($(KERNEL_NO_GCC), true)
     GCC_PREBUILTS := $(BUILD_TOP)/prebuilts/gcc/$(HOST_PREBUILT_TAG)
@@ -199,9 +199,9 @@ ifneq ($(KERNEL_NO_GCC), true)
 
     ifeq ($(KERNEL_ARCH),arm64)
         # Add 32-bit GCC to PATH so that arm-linux-androidkernel-as is available for CONFIG_COMPAT_VDSO
-        TOOLS_PATH_OVERRIDE += PATH=$(BUILD_TOP)/prebuilts/tools-lineage/$(HOST_PREBUILT_TAG)/bin:$(KERNEL_TOOLCHAIN_arm):$$PATH
+        TOOLS_PATH_OVERRIDE += PATH=$(BUILD_TOP)/prebuilts/tools-aicp/$(HOST_PREBUILT_TAG)/bin:$(KERNEL_TOOLCHAIN_arm):$$PATH
     else
-        TOOLS_PATH_OVERRIDE += PATH=$(BUILD_TOP)/prebuilts/tools-lineage/$(HOST_PREBUILT_TAG)/bin:$$PATH
+        TOOLS_PATH_OVERRIDE += PATH=$(BUILD_TOP)/prebuilts/tools-aicp/$(HOST_PREBUILT_TAG)/bin:$$PATH
     endif
 
     # Set the full path to the clang command and LLVM binutils
@@ -225,7 +225,7 @@ else
     KERNEL_MAKE_FLAGS += HOSTCFLAGS="$(KERNEL_HOST_C_LD_FLAGS_SYSROOT) -I$(BUILD_TOP)/prebuilts/kernel-build-tools/linux-x86/include"
     KERNEL_MAKE_FLAGS += HOSTLDFLAGS="$(KERNEL_HOST_C_LD_FLAGS_SYSROOT) -Wl,-rpath,$(BUILD_TOP)/prebuilts/kernel-build-tools/linux-x86/lib64 -L $(BUILD_TOP)/prebuilts/kernel-build-tools/linux-x86/lib64 -fuse-ld=lld --rtlib=compiler-rt"
 
-    TOOLS_PATH_OVERRIDE += PATH=$(BUILD_TOP)/prebuilts/tools-lineage/$(HOST_PREBUILT_TAG)/bin:$(TARGET_KERNEL_CLANG_PATH)/bin:$(BUILD_TOP)/prebuilts/rust/$(HOST_PREBUILT_TAG)/$(TARGET_KERNEL_RUST_VERSION)/bin:$(BUILD_TOP)/prebuilts/clang-tools/$(HOST_PREBUILT_TAG)/bin:$$PATH
+    TOOLS_PATH_OVERRIDE += PATH=$(BUILD_TOP)/prebuilts/tools-aicp/$(HOST_PREBUILT_TAG)/bin:$(TARGET_KERNEL_CLANG_PATH)/bin:$(BUILD_TOP)/prebuilts/rust/$(HOST_PREBUILT_TAG)/$(TARGET_KERNEL_RUST_VERSION)/bin:$(BUILD_TOP)/prebuilts/clang-tools/$(HOST_PREBUILT_TAG)/bin:$$PATH
 endif
 
 # Set DTBO image locations so the build system knows to build them
diff --git a/config/BoardConfigLineage.mk b/config/BoardConfigLineage.mk
index 172d2966b..4993aaa92 100644
--- a/config/BoardConfigLineage.mk
+++ b/config/BoardConfigLineage.mk
@@ -4,10 +4,10 @@
 # Recovery
 BOARD_USES_FULL_RECOVERY_IMAGE ?= true
 
-include vendor/lineage/config/BoardConfigKernel.mk
+include vendor/aicp/config/BoardConfigKernel.mk
 
 ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
     include hardware/qcom-caf/common/BoardConfigQcom.mk
 endif
 
-include vendor/lineage/config/BoardConfigSoong.mk
+include vendor/aicp/config/BoardConfigSoong.mk
diff --git a/config/aosp_audio.mk b/config/aosp_audio.mk
index 2d4727437..579133451 100644
--- a/config/aosp_audio.mk
+++ b/config/aosp_audio.mk
@@ -24,13 +24,13 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/alarms/ogg/Barium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Barium.ogg \
     $(LOCAL_PATH)/alarms/ogg/Hassium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Hassium.ogg \
     $(LOCAL_PATH)/alarms/ogg/Scandium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Scandium.ogg \
-    vendor/lineage/prebuilt/common/media/audio/alarms/Argon-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Argon-old.ogg \
-    vendor/lineage/prebuilt/common/media/audio/alarms/Carbon-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Carbon-old.ogg \
-    vendor/lineage/prebuilt/common/media/audio/alarms/Krypton-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Krypton-old.ogg \
-    vendor/lineage/prebuilt/common/media/audio/alarms/Neon-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Neon-old.ogg \
-    vendor/lineage/prebuilt/common/media/audio/alarms/Osmium-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Osmium-old.ogg \
-    vendor/lineage/prebuilt/common/media/audio/alarms/Oxygen-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Oxygen-old.ogg \
-    vendor/lineage/prebuilt/common/media/audio/alarms/Platinum-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Platinum-old.ogg
+    vendor/aicp/prebuilt/common/media/audio/alarms/Argon-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Argon-old.ogg \
+    vendor/aicp/prebuilt/common/media/audio/alarms/Carbon-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Carbon-old.ogg \
+    vendor/aicp/prebuilt/common/media/audio/alarms/Krypton-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Krypton-old.ogg \
+    vendor/aicp/prebuilt/common/media/audio/alarms/Neon-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Neon-old.ogg \
+    vendor/aicp/prebuilt/common/media/audio/alarms/Osmium-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Osmium-old.ogg \
+    vendor/aicp/prebuilt/common/media/audio/alarms/Oxygen-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Oxygen-old.ogg \
+    vendor/aicp/prebuilt/common/media/audio/alarms/Platinum-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Platinum-old.ogg
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/F1_New_SMS.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/F1_New_SMS.ogg \
diff --git a/config/common.mk b/config/common.mk
index 1e4a825fb..9d1fdbed4 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -45,18 +45,18 @@ endif
 
 # Backup Tool
 PRODUCT_COPY_FILES += \
-    vendor/lineage/prebuilt/common/bin/backuptool.sh:install/bin/backuptool.sh \
-    vendor/lineage/prebuilt/common/bin/backuptool.functions:install/bin/backuptool.functions \
-    vendor/lineage/prebuilt/common/bin/50-lineage.sh:$(TARGET_COPY_OUT_SYSTEM)/addon.d/50-lineage.sh
+    vendor/aicp/prebuilt/common/bin/backuptool.sh:install/bin/backuptool.sh \
+    vendor/aicp/prebuilt/common/bin/backuptool.functions:install/bin/backuptool.functions \
+    vendor/aicp/prebuilt/common/bin/50-lineage.sh:$(TARGET_COPY_OUT_SYSTEM)/addon.d/50-lineage.sh
 
 PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
     system/addon.d/50-lineage.sh
 
 ifneq ($(strip $(AB_OTA_PARTITIONS) $(AB_OTA_POSTINSTALL_CONFIG)),)
 PRODUCT_COPY_FILES += \
-    vendor/lineage/prebuilt/common/bin/backuptool_ab.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool_ab.sh \
-    vendor/lineage/prebuilt/common/bin/backuptool_ab.functions:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool_ab.functions \
-    vendor/lineage/prebuilt/common/bin/backuptool_postinstall.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool_postinstall.sh
+    vendor/aicp/prebuilt/common/bin/backuptool_ab.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool_ab.sh \
+    vendor/aicp/prebuilt/common/bin/backuptool_ab.functions:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool_ab.functions \
+    vendor/aicp/prebuilt/common/bin/backuptool_postinstall.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool_postinstall.sh
 
 PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
     system/bin/backuptool_ab.sh \
@@ -71,11 +71,11 @@ endif
 
 # Lineage-specific broadcast actions whitelist
 PRODUCT_COPY_FILES += \
-    vendor/lineage/config/permissions/lineage-sysconfig.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/lineage-sysconfig.xml
+    vendor/aicp/config/permissions/lineage-sysconfig.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/lineage-sysconfig.xml
 
 # Lineage-specific init rc file
 PRODUCT_COPY_FILES += \
-    vendor/lineage/prebuilt/common/etc/init/init.lineage-system_ext.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/init.lineage-system_ext.rc
+    vendor/aicp/prebuilt/common/etc/init/init.lineage-system_ext.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/init.lineage-system_ext.rc
 
 # Enable SIP+VoIP on all targets
 PRODUCT_COPY_FILES += \
@@ -95,7 +95,7 @@ PRODUCT_PACKAGES += \
 
 # This is Lineage!
 PRODUCT_COPY_FILES += \
-    vendor/lineage/config/permissions/org.lineageos.android.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.android.xml
+    vendor/aicp/config/permissions/org.lineageos.android.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.android.xml
 
 # Enforce privapp-permissions whitelist
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
@@ -103,7 +103,7 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
 
 ifneq ($(TARGET_DISABLE_LINEAGE_SDK), true)
 # Lineage SDK
-include vendor/lineage/config/lineage_sdk_common.mk
+include vendor/aicp/config/lineage_sdk_common.mk
 endif
 
 # Do not include art debug targets
@@ -156,7 +156,7 @@ PRODUCT_PACKAGES += \
     Updater
 
 PRODUCT_COPY_FILES += \
-    vendor/lineage/prebuilt/common/etc/init/init.lineage-updater.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/init.lineage-updater.rc
+    vendor/aicp/prebuilt/common/etc/init/init.lineage-updater.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/init.lineage-updater.rc
 
 # Config
 PRODUCT_PACKAGES += \
@@ -196,7 +196,7 @@ PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
 
 # FRP
 PRODUCT_COPY_FILES += \
-    vendor/lineage/prebuilt/common/bin/wipe-frp.sh:$(TARGET_COPY_OUT_RECOVERY)/root/system/bin/wipe-frp
+    vendor/aicp/prebuilt/common/bin/wipe-frp.sh:$(TARGET_COPY_OUT_RECOVERY)/root/system/bin/wipe-frp
 
 # Openssh
 PRODUCT_PACKAGES += \
@@ -209,7 +209,7 @@ PRODUCT_PACKAGES += \
     start-ssh
 
 PRODUCT_COPY_FILES += \
-    vendor/lineage/prebuilt/common/etc/init/init.openssh.rc:$(TARGET_COPY_OUT_PRODUCT)/etc/init/init.openssh.rc
+    vendor/aicp/prebuilt/common/etc/init/init.openssh.rc:$(TARGET_COPY_OUT_PRODUCT)/etc/init/init.openssh.rc
 
 # rsync
 PRODUCT_PACKAGES += \
@@ -255,17 +255,17 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
 endif
 
 # Audio files
-$(call inherit-product, vendor/lineage/audio/audio.mk)
+$(call inherit-product, vendor/aicp/audio/audio.mk)
 
 # SetupWizard
 PRODUCT_PRODUCT_PROPERTIES += \
     setupwizard.theme=glif_v4 \
     setupwizard.feature.day_night_mode_enabled=true
 
-PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/lineage/overlay/no-rro
+PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/aicp/overlay/no-rro
 PRODUCT_PACKAGE_OVERLAYS += \
-    vendor/lineage/overlay/common \
-    vendor/lineage/overlay/no-rro
+    vendor/aicp/overlay/common \
+    vendor/aicp/overlay/no-rro
 
 PRODUCT_PACKAGES += \
     DocumentsUIOverlay \
@@ -283,11 +283,11 @@ PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/crowdin/overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/crowdin/overlay
 
 PRODUCT_EXTRA_RECOVERY_KEYS += \
-    vendor/lineage/build/target/product/security/lineage
+    vendor/aicp/build/target/product/security/lineage
 
-include vendor/lineage/config/version.mk
+include vendor/aicp/config/version.mk
 
--include vendor/lineage-priv/keys/keys.mk
+-include vendor/aicp-priv/keys/keys.mk
 
 -include $(WORKSPACE)/build_env/image-auto-bits.mk
--include vendor/lineage/config/partner_gms.mk
+-include vendor/aicp/config/partner_gms.mk
diff --git a/config/common_car.mk b/config/common_car.mk
index 868e97339..fa8a9f384 100644
--- a/config/common_car.mk
+++ b/config/common_car.mk
@@ -1,5 +1,5 @@
 # Inherit common Lineage stuff
-$(call inherit-product, vendor/lineage/config/common.mk)
+$(call inherit-product, vendor/aicp/config/common.mk)
 
 # Inherit Lineage car device tree
 $(call inherit-product, device/lineage/car/lineage_car.mk)
diff --git a/config/common_full_foldable_book_telephony.mk b/config/common_full_foldable_book_telephony.mk
index 547586c47..06ee37ad1 100644
--- a/config/common_full_foldable_book_telephony.mk
+++ b/config/common_full_foldable_book_telephony.mk
@@ -1,13 +1,13 @@
 # Inherit mobile full common Lineage stuff
-$(call inherit-product, vendor/lineage/config/common_mobile_full.mk)
+$(call inherit-product, vendor/aicp/config/common_mobile_full.mk)
 
 # Enable support of one-handed mode
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.support_one_handed_mode?=true
 
 # Inherit tablet common Lineage stuff
-$(call inherit-product, vendor/lineage/config/tablet.mk)
+$(call inherit-product, vendor/aicp/config/tablet.mk)
 
-$(call inherit-product, vendor/lineage/config/telephony.mk)
+$(call inherit-product, vendor/aicp/config/telephony.mk)
 
-PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/foldable_book
+PRODUCT_PACKAGE_OVERLAYS += vendor/aicp/overlay/foldable_book
diff --git a/config/common_full_go_phone.mk b/config/common_full_go_phone.mk
index 1e5e90465..927ed59fd 100644
--- a/config/common_full_go_phone.mk
+++ b/config/common_full_go_phone.mk
@@ -2,4 +2,4 @@
 PRODUCT_TYPE := go
 
 # Inherit full common Lineage stuff
-$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
+$(call inherit-product, vendor/aicp/config/common_full_phone.mk)
diff --git a/config/common_full_phone.mk b/config/common_full_phone.mk
index 771cc9c0b..7106be47a 100644
--- a/config/common_full_phone.mk
+++ b/config/common_full_phone.mk
@@ -1,8 +1,8 @@
 # Inherit mobile full common Lineage stuff
-$(call inherit-product, vendor/lineage/config/common_mobile_full.mk)
+$(call inherit-product, vendor/aicp/config/common_mobile_full.mk)
 
 # Enable support of one-handed mode
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.support_one_handed_mode?=true
 
-$(call inherit-product, vendor/lineage/config/telephony.mk)
+$(call inherit-product, vendor/aicp/config/telephony.mk)
diff --git a/config/common_full_tablet.mk b/config/common_full_tablet.mk
index c837d2131..bb8826f5a 100644
--- a/config/common_full_tablet.mk
+++ b/config/common_full_tablet.mk
@@ -1,7 +1,7 @@
 # Inherit mobile full common Lineage stuff
-$(call inherit-product, vendor/lineage/config/common_mobile_full.mk)
+$(call inherit-product, vendor/aicp/config/common_mobile_full.mk)
 
 # Inherit tablet common Lineage stuff
-$(call inherit-product, vendor/lineage/config/tablet.mk)
+$(call inherit-product, vendor/aicp/config/tablet.mk)
 
-$(call inherit-product, vendor/lineage/config/telephony.mk)
+$(call inherit-product, vendor/aicp/config/telephony.mk)
diff --git a/config/common_full_tablet_wifionly.mk b/config/common_full_tablet_wifionly.mk
index a7a07f794..b3f739b14 100644
--- a/config/common_full_tablet_wifionly.mk
+++ b/config/common_full_tablet_wifionly.mk
@@ -1,7 +1,7 @@
 # Inherit mobile full common Lineage stuff
-$(call inherit-product, vendor/lineage/config/common_mobile_full.mk)
+$(call inherit-product, vendor/aicp/config/common_mobile_full.mk)
 
 # Inherit tablet common Lineage stuff
-$(call inherit-product, vendor/lineage/config/tablet.mk)
+$(call inherit-product, vendor/aicp/config/tablet.mk)
 
-$(call inherit-product, vendor/lineage/config/wifionly.mk)
+$(call inherit-product, vendor/aicp/config/wifionly.mk)
diff --git a/config/common_full_tv.mk b/config/common_full_tv.mk
index 416fed01b..6e610cbf1 100644
--- a/config/common_full_tv.mk
+++ b/config/common_full_tv.mk
@@ -1,4 +1,4 @@
 # This config is for legacy purposes, there are no atv product size variants
 
 # Inherit common atv Lineage stuff
-$(call inherit-product, vendor/lineage/config/common_tv.mk)
+$(call inherit-product, vendor/aicp/config/common_tv.mk)
diff --git a/config/common_mini_go_phone.mk b/config/common_mini_go_phone.mk
index 627c0d9e2..d444c245e 100644
--- a/config/common_mini_go_phone.mk
+++ b/config/common_mini_go_phone.mk
@@ -2,4 +2,4 @@
 PRODUCT_TYPE := go
 
 # Inherit mini common Lineage stuff
-$(call inherit-product, vendor/lineage/config/common_mini_phone.mk)
+$(call inherit-product, vendor/aicp/config/common_mini_phone.mk)
diff --git a/config/common_mini_phone.mk b/config/common_mini_phone.mk
index 4c79bfa41..c54038f99 100644
--- a/config/common_mini_phone.mk
+++ b/config/common_mini_phone.mk
@@ -1,4 +1,4 @@
 # Inherit mobile mini common Lineage stuff
-$(call inherit-product, vendor/lineage/config/common_mobile_mini.mk)
+$(call inherit-product, vendor/aicp/config/common_mobile_mini.mk)
 
-$(call inherit-product, vendor/lineage/config/telephony.mk)
+$(call inherit-product, vendor/aicp/config/telephony.mk)
diff --git a/config/common_mini_tablet.mk b/config/common_mini_tablet.mk
index addd0a57a..60bece0ce 100644
--- a/config/common_mini_tablet.mk
+++ b/config/common_mini_tablet.mk
@@ -1,7 +1,7 @@
 # Inherit mobile mini common Lineage stuff
-$(call inherit-product, vendor/lineage/config/common_mobile_mini.mk)
+$(call inherit-product, vendor/aicp/config/common_mobile_mini.mk)
 
 # Inherit tablet common Lineage stuff
-$(call inherit-product, vendor/lineage/config/tablet.mk)
+$(call inherit-product, vendor/aicp/config/tablet.mk)
 
-$(call inherit-product, vendor/lineage/config/telephony.mk)
+$(call inherit-product, vendor/aicp/config/telephony.mk)
diff --git a/config/common_mini_tablet_wifionly.mk b/config/common_mini_tablet_wifionly.mk
index 8f6d16e3d..d151d7870 100644
--- a/config/common_mini_tablet_wifionly.mk
+++ b/config/common_mini_tablet_wifionly.mk
@@ -1,7 +1,7 @@
 # Inherit mobile mini common Lineage stuff
-$(call inherit-product, vendor/lineage/config/common_mobile_mini.mk)
+$(call inherit-product, vendor/aicp/config/common_mobile_mini.mk)
 
 # Inherit tablet common Lineage stuff
-$(call inherit-product, vendor/lineage/config/tablet.mk)
+$(call inherit-product, vendor/aicp/config/tablet.mk)
 
-$(call inherit-product, vendor/lineage/config/wifionly.mk)
+$(call inherit-product, vendor/aicp/config/wifionly.mk)
diff --git a/config/common_mini_tv.mk b/config/common_mini_tv.mk
index 416fed01b..6e610cbf1 100644
--- a/config/common_mini_tv.mk
+++ b/config/common_mini_tv.mk
@@ -1,4 +1,4 @@
 # This config is for legacy purposes, there are no atv product size variants
 
 # Inherit common atv Lineage stuff
-$(call inherit-product, vendor/lineage/config/common_tv.mk)
+$(call inherit-product, vendor/aicp/config/common_tv.mk)
diff --git a/config/common_mobile.mk b/config/common_mobile.mk
index 758a5b43d..5c7ab8d97 100644
--- a/config/common_mobile.mk
+++ b/config/common_mobile.mk
@@ -1,12 +1,12 @@
 # Inherit common mobile Lineage stuff
-$(call inherit-product, vendor/lineage/config/common.mk)
+$(call inherit-product, vendor/aicp/config/common.mk)
 
 # Include AOSP audio files
 $(call inherit-product-if-exists, frameworks/base/data/sounds/AudioPackage14.mk)
-include vendor/lineage/config/aosp_audio.mk
+include vendor/aicp/config/aosp_audio.mk
 
 # Include Lineage audio files
-include vendor/lineage/config/lineage_audio.mk
+include vendor/aicp/config/lineage_audio.mk
 
 # Default notification/alarm sounds
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/config/common_mobile_full.mk b/config/common_mobile_full.mk
index 22b1acf2f..eb833f44d 100644
--- a/config/common_mobile_full.mk
+++ b/config/common_mobile_full.mk
@@ -1,5 +1,5 @@
 # Inherit common Lineage stuff
-$(call inherit-product, vendor/lineage/config/common_mobile.mk)
+$(call inherit-product, vendor/aicp/config/common_mobile.mk)
 
 PRODUCT_SIZE := full
 
@@ -38,5 +38,5 @@ PRODUCT_PACKAGES += \
     FontRubikOverlay
 
 # Include Lineage LatinIME dictionaries
-PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/dictionaries
-PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/lineage/overlay/dictionaries
+PRODUCT_PACKAGE_OVERLAYS += vendor/aicp/overlay/dictionaries
+PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/aicp/overlay/dictionaries
diff --git a/config/common_mobile_mini.mk b/config/common_mobile_mini.mk
index 8e8f88f2e..cbaf4ebc3 100644
--- a/config/common_mobile_mini.mk
+++ b/config/common_mobile_mini.mk
@@ -1,4 +1,4 @@
 # Inherit mini common Lineage stuff
-$(call inherit-product, vendor/lineage/config/common_mobile.mk)
+$(call inherit-product, vendor/aicp/config/common_mobile.mk)
 
 PRODUCT_SIZE := mini
diff --git a/config/common_tv.mk b/config/common_tv.mk
index a5dcb01e5..d880eb753 100644
--- a/config/common_tv.mk
+++ b/config/common_tv.mk
@@ -1,5 +1,5 @@
 # Inherit common Lineage stuff
-$(call inherit-product, vendor/lineage/config/common.mk)
+$(call inherit-product, vendor/aicp/config/common.mk)
 
 # Include AOSP audio files
 $(call inherit-product-if-exists, frameworks/base/data/sounds/AudioTv.mk)
@@ -16,4 +16,4 @@ PRODUCT_PACKAGES += \
     Catapult \
     LineageCustomizer
 
-PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/tv
+PRODUCT_PACKAGE_OVERLAYS += vendor/aicp/overlay/tv
diff --git a/config/lineage_audio.mk b/config/lineage_audio.mk
index b87dfca1d..71affed31 100644
--- a/config/lineage_audio.mk
+++ b/config/lineage_audio.mk
@@ -2,9 +2,9 @@
 # Lineage Audio Files
 #
 
-ALARM_PATH := vendor/lineage/prebuilt/common/media/audio/alarms
-NOTIFICATION_PATH := vendor/lineage/prebuilt/common/media/audio/notifications
-RINGTONE_PATH := vendor/lineage/prebuilt/common/media/audio/ringtones
+ALARM_PATH := vendor/aicp/prebuilt/common/media/audio/alarms
+NOTIFICATION_PATH := vendor/aicp/prebuilt/common/media/audio/notifications
+RINGTONE_PATH := vendor/aicp/prebuilt/common/media/audio/ringtones
 
 # Alarms
 PRODUCT_COPY_FILES += \
diff --git a/config/lineage_sdk_common.mk b/config/lineage_sdk_common.mk
index 306ebd272..3556e7701 100644
--- a/config/lineage_sdk_common.mk
+++ b/config/lineage_sdk_common.mk
@@ -1,12 +1,12 @@
 # Permissions for lineage sdk services
 PRODUCT_COPY_FILES += \
-    vendor/lineage/config/permissions/org.lineageos.globalactions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.globalactions.xml \
-    vendor/lineage/config/permissions/org.lineageos.hardware.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.hardware.xml \
-    vendor/lineage/config/permissions/org.lineageos.health.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.health.xml \
-    vendor/lineage/config/permissions/org.lineageos.livedisplay.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.livedisplay.xml \
-    vendor/lineage/config/permissions/org.lineageos.profiles.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.profiles.xml \
-    vendor/lineage/config/permissions/org.lineageos.settings.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.settings.xml \
-    vendor/lineage/config/permissions/org.lineageos.trust.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.trust.xml
+    vendor/aicp/config/permissions/org.lineageos.globalactions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.globalactions.xml \
+    vendor/aicp/config/permissions/org.lineageos.hardware.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.hardware.xml \
+    vendor/aicp/config/permissions/org.lineageos.health.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.health.xml \
+    vendor/aicp/config/permissions/org.lineageos.livedisplay.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.livedisplay.xml \
+    vendor/aicp/config/permissions/org.lineageos.profiles.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.profiles.xml \
+    vendor/aicp/config/permissions/org.lineageos.settings.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.settings.xml \
+    vendor/aicp/config/permissions/org.lineageos.trust.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.trust.xml
 
 # Lineage Platform Library
 PRODUCT_PACKAGES += \
diff --git a/config/tablet.mk b/config/tablet.mk
index c164a1af8..3fe73c0e2 100644
--- a/config/tablet.mk
+++ b/config/tablet.mk
@@ -9,4 +9,4 @@ PRODUCT_PRODUCT_PROPERTIES += \
     persist.settings.large_screen_opt.enabled=true
 
 # Tablet-specific overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/tablet
+PRODUCT_PACKAGE_OVERLAYS += vendor/aicp/overlay/tablet
diff --git a/config/wifionly.mk b/config/wifionly.mk
index cf96c20d7..000e8b16c 100644
--- a/config/wifionly.mk
+++ b/config/wifionly.mk
@@ -2,4 +2,4 @@
 PRODUCT_PACKAGES += \
     EmergencyInfo
 
-PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/wifionly
+PRODUCT_PACKAGE_OVERLAYS += vendor/aicp/overlay/wifionly