marlin sailfish: AICPfy

Change-Id: I2c77262d1c55db25d4fcc1d25beb8d77d8af6a48

25 files changed, 60 insertions, 173 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index bd57cbe2..91f65937 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -2,5 +2,5 @@ PRODUCT_MAKEFILES := \
 	$(LOCAL_DIR)/aosp_marlin.mk \
 	$(LOCAL_DIR)/aosp_marlin_svelte.mk \
 	$(LOCAL_DIR)/aosp_sailfish.mk \
-	$(LOCAL_DIR)/lineage_marlin.mk \
-	$(LOCAL_DIR)/lineage_sailfish.mk
+	$(LOCAL_DIR)/aicp_marlin.mk \
+	$(LOCAL_DIR)/aicp_sailfish.mk
diff --git a/BoardConfigLineage.mk b/BoardConfigAicp.mk
index 40fbd104..40fbd104 100644
--- a/BoardConfigLineage.mk
+++ b/BoardConfigAicp.mk
diff --git a/aicp.dependencies b/aicp.dependencies
new file mode 100644
index 00000000..6652c2c2
--- /dev/null
+++ b/aicp.dependencies
@@ -0,0 +1,12 @@
+[
+  {
+    "repository": "AICP/kernel_google_marlin",
+    "target_path": "kernel/google/marlin",
+    "branch": "p9.0"
+  },
+  {
+    "repository": "AICP/proprietary_vendor_google",
+    "target_path": "vendor/google",
+    "branch": "p9.0"
+  }
+]
diff --git a/lineage_marlin.mk b/aicp_marlin.mk
index 7a1084c8..b1bf8838 100644
--- a/lineage_marlin.mk
+++ b/aicp_marlin.mk
@@ -2,16 +2,16 @@
 TARGET_SCREEN_HEIGHT := 2560
 TARGET_SCREEN_WIDTH := 1440
 
-# Inherit some common Lineage stuff.
-$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
+# Inherit some common Aicp stuff.
+$(call inherit-product, vendor/aicp/config/common_full_phone.mk)
 
 # Inherit device configuration
 $(call inherit-product, device/google/marlin/aosp_marlin.mk)
 
--include device/google/marlin/marlin/device-lineage.mk
+-include device/google/marlin/marlin/device-aicp.mk
 
 ## Device identifier. This must come after all inclusions
-PRODUCT_NAME := lineage_marlin
+PRODUCT_NAME := aicp_marlin
 PRODUCT_BRAND := google
 PRODUCT_MODEL := Pixel XL
 TARGET_MANUFACTURER := HTC
diff --git a/lineage_sailfish.mk b/aicp_sailfish.mk
index 6e8ee8f7..3d6a5da5 100644
--- a/lineage_sailfish.mk
+++ b/aicp_sailfish.mk
@@ -2,16 +2,16 @@
 TARGET_SCREEN_HEIGHT := 1920
 TARGET_SCREEN_WIDTH := 1080
 
-# Inherit some common Lineage stuff.
-$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
+# Inherit some common Aicp stuff.
+$(call inherit-product, vendor/aicp/config/common_full_phone.mk)
 
 # Inherit device configuration
 $(call inherit-product, device/google/marlin/aosp_sailfish.mk)
 
--include device/google/marlin/sailfish/device-lineage.mk
+-include device/google/marlin/sailfish/device-aicp.mk
 
 ## Device identifier. This must come after all inclusions
-PRODUCT_NAME := lineage_sailfish
+PRODUCT_NAME := aicp_sailfish
 PRODUCT_BRAND := google
 PRODUCT_MODEL := Pixel
 TARGET_MANUFACTURER := HTC
diff --git a/device-lineage.mk b/device-aicp.mk
index 9a09136c..9a09136c 100644
--- a/device-lineage.mk
+++ b/device-aicp.mk
diff --git a/device-common.mk b/device-common.mk
index 4f04a651..4a39e088 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -288,7 +288,7 @@ PRODUCT_PACKAGES += \
 
 # sensor utilities (only for userdebug and eng builds)
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-ifeq (,$(filter lineage_marlin lineage_sailfish, $(TARGET_PRODUCT)))
+ifeq (,$(filter aicp_marlin aicp_sailfish, $(TARGET_PRODUCT)))
 PRODUCT_PACKAGES += \
     nanotool \
     sensortest
@@ -328,7 +328,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # Write Manufacturer & Model information in created media files.
 # IMPORTANT: ONLY SET THIS PROPERTY TO TRUE FOR PUBLIC DEVICES
-ifneq ($(filter lineage_sailfish% aosp_sailfish% sailfish% lineage_marlin% aosp_marlin% marlin%, $(TARGET_PRODUCT)),)
+ifneq ($(filter aicp_sailfish% aosp_sailfish% sailfish% aicp_marlin% aosp_marlin% marlin%, $(TARGET_PRODUCT)),)
 PRODUCT_PROPERTY_OVERRIDES += \
     media.recorder.show_manufacturer_and_model=true
 else
@@ -530,7 +530,7 @@ PRODUCT_PACKAGES += \
 
 # Library used for VTS tests  (only for userdebug and eng builds)
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-ifeq (,$(filter lineage_marlin lineage_sailfish, $(TARGET_PRODUCT)))
+ifeq (,$(filter aicp_marlin aicp_sailfish, $(TARGET_PRODUCT)))
 # For VTS profiling.
 PRODUCT_PACKAGES += \
      libvts_profiling \
diff --git a/lineage.dependencies b/lineage.dependencies
deleted file mode 100644
index 4c6fc10e..00000000
--- a/lineage.dependencies
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  {
-    "repository": "android_kernel_google_marlin",
-    "target_path": "kernel/google/marlin"
-  }
-]
diff --git a/marlin/BoardConfig.mk b/marlin/BoardConfig.mk
index 4f015fdf..6ac834a5 100644
--- a/marlin/BoardConfig.mk
+++ b/marlin/BoardConfig.mk
@@ -3,8 +3,8 @@
 # Product-specific compile-time definitions
 #
 
-# Allow Lineage config to override others
--include device/google/marlin/marlin/BoardConfigLineage.mk
+# Allow Aicp config to override others
+-include device/google/marlin/marlin/BoardConfigAicp.mk
 
 TARGET_BOARD_PLATFORM := msm8996
 TARGET_BOOTLOADER_BOARD_NAME := marlin
@@ -12,6 +12,8 @@ TARGET_BOARD_INFO_FILE := device/google/marlin/marlin/board-info.txt
 
 TARGET_USES_INTERACTION_BOOST := true
 
+SELINUX_IGNORE_NEVERALLOWS := true
+
 TARGET_USES_AOSP := true
 TARGET_ARCH := arm64
 TARGET_ARCH_VARIANT := armv8-a
@@ -109,7 +111,7 @@ BOARD_ROOT_EXTRA_FOLDERS := firmware firmware/radio persist
 BOARD_ROOT_EXTRA_SYMLINKS := /vendor/lib/dsp:/dsp
 
 BOARD_SEPOLICY_DIRS += device/google/marlin/sepolicy
-ifneq ($(filter lineage_marlin marlin marlinf, $(TARGET_PRODUCT)),)
+ifneq ($(filter aicp_marlin marlin marlinf, $(TARGET_PRODUCT)),)
 BOARD_SEPOLICY_DIRS += device/google/marlin/sepolicy/verizon
 endif
 BOARD_PLAT_PRIVATE_SEPOLICY_DIR := device/google/marlin/sepolicy/private
diff --git a/marlin/BoardConfigAicp.mk b/marlin/BoardConfigAicp.mk
new file mode 100644
index 00000000..03a1cda8
--- /dev/null
+++ b/marlin/BoardConfigAicp.mk
@@ -0,0 +1,4 @@
+# BoardConfig for aicp_marlin
+include device/google/marlin/BoardConfigAicp.mk
+
+-include vendor/google/marlin/BoardConfigVendor.mk
diff --git a/marlin/BoardConfigLineage.mk b/marlin/BoardConfigLineage.mk
deleted file mode 100644
index 43757e8d..00000000
--- a/marlin/BoardConfigLineage.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# BoardConfig for lineage_marlin
-include device/google/marlin/BoardConfigLineage.mk
-
--include vendor/google/marlin/BoardConfigVendor.mk
diff --git a/marlin/device-aicp.mk b/marlin/device-aicp.mk
new file mode 100644
index 00000000..d1fce23b
--- /dev/null
+++ b/marlin/device-aicp.mk
@@ -0,0 +1 @@
+$(call inherit-product, device/google/marlin/device-aicp.mk)
diff --git a/marlin/device-lineage.mk b/marlin/device-lineage.mk
deleted file mode 100644
index 137942dc..00000000
--- a/marlin/device-lineage.mk
+++ /dev/null
@@ -1 +0,0 @@
-$(call inherit-product, device/google/marlin/device-lineage.mk)
diff --git a/marlin/extract-files.sh b/marlin/extract-files.sh
index d3f3ea93..533b4e23 100755
--- a/marlin/extract-files.sh
+++ b/marlin/extract-files.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2019 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.
@@ -23,9 +23,9 @@ DEVICE=marlin
 MY_DIR="${BASH_SOURCE%/*}"
 if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
 
-LINEAGE_ROOT="$MY_DIR"/../../..
+AICP_ROOT="$MY_DIR"/../../..
 
-HELPER="$LINEAGE_ROOT"/vendor/lineage/build/tools/extract_utils.sh
+HELPER="$AICP_ROOT"/vendor/aicp/build/tools/extract_utils.sh
 if [ ! -f "$HELPER" ]; then
     echo "Unable to find helper script at $HELPER"
     exit 1
@@ -49,13 +49,13 @@ else
 fi
 
 # Initialize the helper
-setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT"
+setup_vendor "$DEVICE" "$VENDOR" "$AICP_ROOT"
 
 extract "$MY_DIR/$DEVICE"/device-proprietary-files.txt "$SRC"
 extract "$MY_DIR/$DEVICE"/device-proprietary-files-vendor.txt "$SRC"
 
 # Don't disable MyVerizonServices app
 sed -i 's|<disabled-until-used-preinstalled-carrier-app package="com.verizon.mips.services" />|<!--disabled-until-used-preinstalled-carrier-app package="com.verizon.mips.services" /-->|g'\
-    "$LINEAGE_ROOT"/vendor/"$VENDOR"/"$DEVICE"/proprietary/etc/sysconfig/nexus.xml
+    "$AICP_ROOT"/vendor/"$VENDOR"/"$DEVICE"/proprietary/etc/sysconfig/nexus.xml
 
 "$MY_DIR/$DEVICE"/setup-makefiles.sh
diff --git a/marlin/setup-makefiles.sh b/marlin/setup-makefiles.sh
index 1a3385f6..f0217465 100755
--- a/marlin/setup-makefiles.sh
+++ b/marlin/setup-makefiles.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2019 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.
@@ -25,9 +25,9 @@ INITIAL_COPYRIGHT_YEAR=2017
 MY_DIR="${BASH_SOURCE%/*}"
 if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
 
-LINEAGE_ROOT="$MY_DIR"/../../../..
+AICP_ROOT="$MY_DIR"/../../../..
 
-HELPER="$LINEAGE_ROOT"/vendor/lineage/build/tools/extract_utils.sh
+HELPER="$AICP_ROOT"/vendor/aicp/build/tools/extract_utils.sh
 if [ ! -f "$HELPER" ]; then
     echo "Unable to find helper script at $HELPER"
     exit 1
@@ -35,7 +35,7 @@ fi
 . "$HELPER"
 
 # Initialize the helper
-setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT"
+setup_vendor "$DEVICE" "$VENDOR" "$AICP_ROOT"
 
 # Copyright headers and guards
 write_headers
diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
deleted file mode 100644
index 22c8a36a..00000000
--- a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright (C) 2016 The CyanogenMod Project
-** Copyright (C) 2017-2018 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.
-*/
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- All the capabilities of the LEDs on this device, stored as a bit field.
-         This integer should equal the sum of the corresponding value for each
-         of the following capabilities present:
-
-         // Device has a color adjustable battery light.
-         LIGHTS_RGB_NOTIFICATION_LED = 1
-
-         // Device has a color adjustable notification light.
-         LIGHTS_RGB_BATTERY_LED = 2
-
-         LIGHTS_MULTIPLE_NOTIFICATION_LED = 4 (deprecated)
-
-         // The notification light has adjustable pulsing capability.
-         LIGHTS_PULSATING_LED = 8
-
-         // Device has a multi-segment battery light that is able to
-         // use the light brightness value to determine how many
-         // segments to show (in order to represent battery level).
-         LIGHTS_SEGMENTED_BATTERY_LED = 16
-
-         // The notification light supports HAL adjustable brightness
-         // via the alpha channel.
-         // Note: if a device notification light supports LIGHTS_RGB_NOTIFICATION_LED
-         // then HAL support is not necessary for brightness control.  In this case,
-         // brightness support will be provided by lineage-sdk through the scaling of
-         // RGB color values.
-         LIGHTS_ADJUSTABLE_NOTIFICATION_LED_BRIGHTNESS = 32
-
-         // Device has a battery light.
-         LIGHTS_BATTERY_LED = 64
-
-         // The battery light supports HAL adjustable brightness via
-         // the alpha channel.
-         // Note: if a device battery light supports LIGHTS_RGB_BATTERY_LED then HAL
-         // support is not necessary for brightness control.  In this case,
-         // brightness support will be provided by lineage-sdk through the scaling of
-         // RGB color values.
-         LIGHTS_ADJUSTABLE_BATTERY_LED_BRIGHTNESS = 128
-
-         For example, a device with notification and battery lights that supports
-         pulsating and RGB control would set this config to 75. -->
-    <integer name="config_deviceLightCapabilities">75</integer>
-
-</resources>
diff --git a/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml b/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml
deleted file mode 100644
index de79aeec..00000000
--- a/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- /* Copyright (c) 2016, The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials provided
- *       with the distribution.
- *     * Neither the name of The Linux Foundation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
--->
-<resources>
-    <bool name="call_recording_enabled">true</bool>
-    <integer name="call_recording_audio_source">4</integer>
-</resources>
diff --git a/overlay-lineage/packages/apps/Snap/res/values/strings.xml b/overlay-lineage/packages/apps/Snap/res/values/strings.xml
deleted file mode 100644
index 001cf1d5..00000000
--- a/overlay-lineage/packages/apps/Snap/res/values/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-                   2019 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.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <string name="pref_video_quality_default" translatable="false">3840x2160</string>
-
-</resources>
diff --git a/sailfish/BoardConfig.mk b/sailfish/BoardConfig.mk
index 466c02d3..0b7b2369 100644
--- a/sailfish/BoardConfig.mk
+++ b/sailfish/BoardConfig.mk
@@ -3,8 +3,8 @@
 # Product-specific compile-time definitions
 #
 
-# Allow Lineage config to override others
--include device/google/marlin/sailfish/BoardConfigLineage.mk
+# Allow Aicp config to override others
+-include device/google/marlin/sailfish/BoardConfigAicp.mk
 
 TARGET_BOARD_PLATFORM := msm8996
 TARGET_BOOTLOADER_BOARD_NAME := sailfish
@@ -12,6 +12,8 @@ TARGET_BOARD_INFO_FILE := device/google/marlin/sailfish/board-info.txt
 
 TARGET_USES_INTERACTION_BOOST := true
 
+SELINUX_IGNORE_NEVERALLOWS := true
+
 TARGET_USES_AOSP := true
 TARGET_ARCH := arm64
 TARGET_ARCH_VARIANT := armv8-a
@@ -99,7 +101,7 @@ BOARD_ROOT_EXTRA_FOLDERS := firmware firmware/radio persist
 BOARD_ROOT_EXTRA_SYMLINKS := /vendor/lib/dsp:/dsp
 
 BOARD_SEPOLICY_DIRS += device/google/marlin/sepolicy
-ifneq ($(filter lineage_sailfish sailfish sailfishf, $(TARGET_PRODUCT)),)
+ifneq ($(filter aicp_sailfish sailfish sailfishf, $(TARGET_PRODUCT)),)
 BOARD_SEPOLICY_DIRS += device/google/marlin/sepolicy/verizon
 endif
 BOARD_PLAT_PRIVATE_SEPOLICY_DIR := device/google/marlin/sepolicy/private
diff --git a/sailfish/BoardConfigLineage.mk b/sailfish/BoardConfigAicp.mk
index 124fc7a0..124fc7a0 100644
--- a/sailfish/BoardConfigLineage.mk
+++ b/sailfish/BoardConfigAicp.mk
diff --git a/sailfish/device-aicp.mk b/sailfish/device-aicp.mk
new file mode 100644
index 00000000..d1fce23b
--- /dev/null
+++ b/sailfish/device-aicp.mk
@@ -0,0 +1 @@
+$(call inherit-product, device/google/marlin/device-aicp.mk)
diff --git a/sailfish/device-lineage.mk b/sailfish/device-lineage.mk
deleted file mode 100644
index 137942dc..00000000
--- a/sailfish/device-lineage.mk
+++ /dev/null
@@ -1 +0,0 @@
-$(call inherit-product, device/google/marlin/device-lineage.mk)
diff --git a/sailfish/extract-files.sh b/sailfish/extract-files.sh
index 91bb11bc..4649d5e7 100755
--- a/sailfish/extract-files.sh
+++ b/sailfish/extract-files.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2019 The LineageOS Project
+# Copyright (C) 2019 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.
@@ -23,9 +23,9 @@ DEVICE=sailfish
 MY_DIR="${BASH_SOURCE%/*}"
 if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
 
-LINEAGE_ROOT="$MY_DIR"/../../..
+AICP_ROOT="$MY_DIR"/../../..
 
-HELPER="$LINEAGE_ROOT"/vendor/lineage/build/tools/extract_utils.sh
+HELPER="$AICP_ROOT"/vendor/aicp/build/tools/extract_utils.sh
 if [ ! -f "$HELPER" ]; then
     echo "Unable to find helper script at $HELPER"
     exit 1
@@ -49,13 +49,13 @@ else
 fi
 
 # Initialize the helper
-setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT"
+setup_vendor "$DEVICE" "$VENDOR" "$AICP_ROOT"
 
 extract "$MY_DIR"/../marlin/$DEVICE/device-proprietary-files.txt "$SRC"
 extract "$MY_DIR"/../marlin/$DEVICE/device-proprietary-files-vendor.txt "$SRC"
 
 # Don't disable MyVerizonServices app
 sed -i 's|<disabled-until-used-preinstalled-carrier-app package="com.verizon.mips.services" />|<!--disabled-until-used-preinstalled-carrier-app package="com.verizon.mips.services" /-->|g'\
-    "$LINEAGE_ROOT"/vendor/"$VENDOR"/"$DEVICE"/proprietary/etc/sysconfig/nexus.xml
+    "$AICP_ROOT"/vendor/"$VENDOR"/"$DEVICE"/proprietary/etc/sysconfig/nexus.xml
 
 "$MY_DIR/../marlin/$DEVICE"/setup-makefiles.sh
diff --git a/sailfish/setup-makefiles.sh b/sailfish/setup-makefiles.sh
index 0d3d70a5..17db89ec 100755
--- a/sailfish/setup-makefiles.sh
+++ b/sailfish/setup-makefiles.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2019 The LineageOS Project
+# Copyright (C) 2019 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.
@@ -25,9 +25,9 @@ INITIAL_COPYRIGHT_YEAR=2019
 MY_DIR="${BASH_SOURCE%/*}"
 if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
 
-LINEAGE_ROOT="$MY_DIR"/../../../..
+AICP_ROOT="$MY_DIR"/../../../..
 
-HELPER="$LINEAGE_ROOT"/vendor/lineage/build/tools/extract_utils.sh
+HELPER="$AICP_ROOT"/vendor/aicp/build/tools/extract_utils.sh
 if [ ! -f "$HELPER" ]; then
     echo "Unable to find helper script at $HELPER"
     exit 1
@@ -35,7 +35,7 @@ fi
 . "$HELPER"
 
 # Initialize the helper
-setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT"
+setup_vendor "$DEVICE" "$VENDOR" "$AICP_ROOT"
 
 # Copyright headers and guards
 write_headers
diff --git a/telephony/Android.mk b/telephony/Android.mk
index 50da2484..21c055c4 100644
--- a/telephony/Android.mk
+++ b/telephony/Android.mk
@@ -1,3 +1,3 @@
-ifeq ($(LINEAGE_BUILD),)
+ifeq ($(AICP_BUILD),)
 include $(call all-subdir-makefiles)
 endif