marlin sailfish: AICPfy

Change-Id: I2c77262d1c55db25d4fcc1d25beb8d77d8af6a48

6 files changed, 15 insertions, 13 deletions

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