AICPfyHEADp9.0

Change-Id: I460deb0c0994e9652adf1ef3c434d076e75f9dfe

19 files changed, 61 insertions, 30 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index fcc1ff1..7b86397 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -17,5 +17,5 @@
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_crosshatch.mk \
     $(LOCAL_DIR)/aosp_blueline.mk \
-    $(LOCAL_DIR)/lineage_blueline.mk \
-    $(LOCAL_DIR)/lineage_crosshatch.mk
+    $(LOCAL_DIR)/aicp_blueline.mk \
+    $(LOCAL_DIR)/aicp_crosshatch.mk
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index cb271ef..7761740 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -121,6 +121,8 @@ BOARD_ROOT_EXTRA_SYMLINKS := /vendor/dsp:/dsp
 BOARD_ROOT_EXTRA_SYMLINKS += /mnt/vendor/persist:/persist
 BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt:/firmware
 
+SELINUX_IGNORE_NEVERALLOWS := true
+
 include device/google/crosshatch/sepolicy/crosshatch-sepolicy.mk
 
 TARGET_FS_CONFIG_GEN := device/google/crosshatch/config.fs
diff --git a/BoardConfigLineage.mk b/BoardConfigAicp.mk
index 6e9036d..1fd00d0 100644
--- a/BoardConfigLineage.mk
+++ b/BoardConfigAicp.mk
@@ -7,7 +7,9 @@ BOARD_KERNEL_IMAGE_NAME := Image.lz4-dtb
 TARGET_COMPILE_WITH_MSM_KERNEL := true
 TARGET_KERNEL_ARCH := arm64
 TARGET_KERNEL_CLANG_COMPILE := true
-TARGET_KERNEL_CONFIG := lineageos_crosshatch_defconfig
+TARGET_KERNEL_CLANG_VERSION := 9.0.1
+KBUILD_COMPILER_STRING := Android (5366838 based on r353983) clang version 9.0.1
+TARGET_KERNEL_CONFIG := b1c1_defconfig
 TARGET_KERNEL_CROSS_COMPILE_PREFIX := aarch64-linux-android-
 TARGET_KERNEL_SOURCE := kernel/google/crosshatch
 
diff --git a/aicp.dependencies b/aicp.dependencies
new file mode 100644
index 0000000..69b6c9f
--- /dev/null
+++ b/aicp.dependencies
@@ -0,0 +1,18 @@
+[
+  {
+    "repository": "AICP/kernel_google_crosshatch",
+    "target_path": "kernel/google/crosshatch",
+    "branch": "p9.0"
+  },
+  {
+    "repository": "TheMuppets/proprietary_vendor_google",
+    "target_path": "vendor/google",
+    "branch": "lineage-16.0"
+  },
+  {
+   "remote": "gitlab",
+   "repository": "xlxfoxxlx/android_vendor_pixelgapps",
+   "target_path": "vendor/pixelgapps",
+   "branch": "pie"
+  }
+]
diff --git a/lineage_blueline.mk b/aicp_blueline.mk
index 77f565c..f08bd78 100644
--- a/lineage_blueline.mk
+++ b/aicp_blueline.mk
@@ -2,16 +2,16 @@
 TARGET_SCREEN_HEIGHT := 2160
 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/crosshatch/aosp_blueline.mk)
 
--include device/google/crosshatch/blueline/device-lineage.mk
+-include device/google/crosshatch/blueline/device-aicp.mk
 
 ## Device identifier. This must come after all inclusions
-PRODUCT_NAME := lineage_blueline
+PRODUCT_NAME := aicp_blueline
 PRODUCT_BRAND := google
 PRODUCT_MODEL := Pixel 3
 TARGET_MANUFACTURER := Google
@@ -24,3 +24,4 @@ PRODUCT_BUILD_PROP_OVERRIDES += \
 BUILD_FINGERPRINT := google/blueline/blueline:9/PQ2A.190305.002/5240760:user/release-keys
 
 $(call inherit-product-if-exists, vendor/google/crosshatch/crosshatch-vendor.mk)
+$(call inherit-product-if-exists, vendor/pixelgapps/pixel-gapps.mk)
diff --git a/lineage_crosshatch.mk b/aicp_crosshatch.mk
index c83928e..78fb954 100644
--- a/lineage_crosshatch.mk
+++ b/aicp_crosshatch.mk
@@ -2,21 +2,29 @@
 TARGET_SCREEN_HEIGHT := 2960
 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/crosshatch/aosp_crosshatch.mk)
 
--include device/google/crosshatch/crosshatch/device-lineage.mk
+-include device/google/crosshatch/crosshatch/device-aicp.mk
+
+# Screen Resolution for the Bootanimation
+TARGET_SCREEN_HEIGHT := 2560
+TARGET_SCREEN_WIDTH := 1440
 
 ## Device identifier. This must come after all inclusions
-PRODUCT_NAME := lineage_crosshatch
+PRODUCT_NAME := aicp_crosshatch
 PRODUCT_BRAND := google
 PRODUCT_MODEL := Pixel 3 XL
 TARGET_MANUFACTURER := Google
 PRODUCT_RESTRICT_VENDOR_FILES := false
 
+# AICP Device Maintainers
+PRODUCT_BUILD_PROP_OVERRIDES += \
+    DEVICE_MAINTAINERS="Davor B (LorD ClockaN)"
+
 PRODUCT_BUILD_PROP_OVERRIDES += \
     PRODUCT_NAME=crosshatch \
     PRIVATE_BUILD_DESC="crosshatch-user 9 PQ2A.190305.002 5240760 release-keys"
@@ -24,3 +32,4 @@ PRODUCT_BUILD_PROP_OVERRIDES += \
 BUILD_FINGERPRINT := google/crosshatch/crosshatch:9/PQ2A.190305.002/5240760:user/release-keys
 
 $(call inherit-product-if-exists, vendor/google/crosshatch/crosshatch-vendor.mk)
+$(call inherit-product-if-exists, vendor/pixelgapps/pixel-gapps.mk)
diff --git a/blueline/BoardConfig.mk b/blueline/BoardConfig.mk
index 8d9ba24..735882d 100644
--- a/blueline/BoardConfig.mk
+++ b/blueline/BoardConfig.mk
@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-# Allow Lineage config to override others
--include device/google/crosshatch/blueline/BoardConfigLineage.mk
+# Allow AICP config to override others
+-include device/google/crosshatch/blueline/BoardConfigAicp.mk
 
 TARGET_BOOTLOADER_BOARD_NAME := blueline
 TARGET_RECOVERY_UI_MARGIN_HEIGHT := 20
diff --git a/blueline/BoardConfigAicp.mk b/blueline/BoardConfigAicp.mk
new file mode 100644
index 0000000..057cdc9
--- /dev/null
+++ b/blueline/BoardConfigAicp.mk
@@ -0,0 +1,2 @@
+# Boardconfig for aicp_blueline
+-include device/google/crosshatch/BoardConfigAicp.mk
diff --git a/blueline/BoardConfigLineage.mk b/blueline/BoardConfigLineage.mk
deleted file mode 100644
index af2de4f..0000000
--- a/blueline/BoardConfigLineage.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Boardconfig for lineage_blueline
--include device/google/crosshatch/BoardConfigLineage.mk
diff --git a/blueline/device-lineage.mk b/blueline/device-aicp.mk
index 7bb47f6..bc7138d 100644
--- a/blueline/device-lineage.mk
+++ b/blueline/device-aicp.mk
@@ -1,4 +1,4 @@
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += device/google/crosshatch/blueline/overlay-lineage
 
-$(call inherit-product, device/google/crosshatch/device-lineage.mk)
+$(call inherit-product, device/google/crosshatch/device-aicp.mk)
diff --git a/crosshatch/BoardConfig.mk b/crosshatch/BoardConfig.mk
index 546f1cd..6253bcb 100644
--- a/crosshatch/BoardConfig.mk
+++ b/crosshatch/BoardConfig.mk
@@ -15,7 +15,7 @@
 #
 
 # Allow Lineage config to override others
--include device/google/crosshatch/crosshatch/BoardConfigLineage.mk
+-include device/google/crosshatch/crosshatch/BoardConfigAicp.mk
 
 TARGET_BOOTLOADER_BOARD_NAME := crosshatch
 TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165
diff --git a/crosshatch/BoardConfigAicp.mk b/crosshatch/BoardConfigAicp.mk
new file mode 100644
index 0000000..35a8db4
--- /dev/null
+++ b/crosshatch/BoardConfigAicp.mk
@@ -0,0 +1,2 @@
+# Boardconfig for aicp_crosshatch
+-include device/google/crosshatch/BoardConfigAicp.mk
diff --git a/crosshatch/BoardConfigLineage.mk b/crosshatch/BoardConfigLineage.mk
deleted file mode 100644
index 9465779..0000000
--- a/crosshatch/BoardConfigLineage.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Boardconfig for lineage_crosshatch
--include device/google/crosshatch/BoardConfigLineage.mk
diff --git a/crosshatch/device-lineage.mk b/crosshatch/device-aicp.mk
index af821eb..b87cfc8 100644
--- a/crosshatch/device-lineage.mk
+++ b/crosshatch/device-aicp.mk
@@ -1,4 +1,4 @@
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += device/google/crosshatch/crosshatch/overlay-lineage
 
-$(call inherit-product, device/google/crosshatch/device-lineage.mk)
+$(call inherit-product, device/google/crosshatch/device-aicp.mk)
diff --git a/device-lineage.mk b/device-aicp.mk
index 4d81305..4d81305 100644
--- a/device-lineage.mk
+++ b/device-aicp.mk
diff --git a/extract-files.sh b/extract-files.sh
index 0d15945..2015ec3 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -25,7 +25,7 @@ if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
 
 CM_ROOT="$MY_DIR"/../../..
 
-HELPER="$CM_ROOT"/vendor/lineage/build/tools/extract_utils.sh
+HELPER="$CM_ROOT"/vendor/aicp/build/tools/extract_utils.sh
 if [ ! -f "$HELPER" ]; then
     echo "Unable to find helper script at $HELPER"
     exit 1
diff --git a/lineage.dependencies b/lineage.dependencies
deleted file mode 100644
index c0de09e..0000000
--- a/lineage.dependencies
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  {
-    "repository": "android_kernel_google_crosshatch",
-    "target_path": "kernel/google/crosshatch"
-  }
-]
diff --git a/patches.txt b/patches.txt
new file mode 100644
index 0000000..517d6d3
--- /dev/null
+++ b/patches.txt
@@ -0,0 +1,5 @@
+# We cannot wait for all patches to be merged,
+# so we pull the patches from gerrit.
+#
+#e.g. 67313/1 http://gerrit.aicp-rom.com prebuilts/clang/host/linux-x86
+87008/1 http://gerrit.aicp-rom.com prebuilts/clang/host/linux-x86
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 183a078..925849c 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -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
@@ -52,7 +52,7 @@ EOF
 }
 
 # Initialize the helper
-setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT"
+setup_vendor "$DEVICE" "$VENDOR" "$AICP_ROOT"
 
 # Copyright headers and guards
 write_crosshatch_headers