AICPfyHEADp9.0

Change-Id: I2cce93da3b2b17a7fb9c40ba7dd17e2dcb4f8c5d

5 files changed, 15 insertions, 68 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 280ab56..f59b42a 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,4 +16,4 @@
 
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_taimen.mk \
-    $(LOCAL_DIR)/lineage_taimen.mk \
+    $(LOCAL_DIR)/aicp_taimen.mk \
diff --git a/aicp.dependencies b/aicp.dependencies
new file mode 100644
index 0000000..ed390b7
--- /dev/null
+++ b/aicp.dependencies
@@ -0,0 +1,12 @@
+[
+    {
+        "repository":   "AICP/device_google_wahoo",
+        "target_path":  "device/google/wahoo",
+        "branch":       "p9.0"
+    },
+    {
+        "repository":  "TheMuppets/proprietary_vendor_google",
+        "target_path": "vendor/google",
+        "branch":      "lineage-16.0"
+    }
+]
diff --git a/lineage_taimen.mk b/aicp_taimen.mk
index ddd93f0..968a747 100644
--- a/lineage_taimen.mk
+++ b/aicp_taimen.mk
@@ -3,7 +3,7 @@ TARGET_SCREEN_HEIGHT := 2880
 TARGET_SCREEN_WIDTH := 1440
 
 # 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/taimen/aosp_taimen.mk)
@@ -11,7 +11,7 @@ $(call inherit-product, device/google/taimen/aosp_taimen.mk)
 -include device/google/wahoo/device-lineage.mk
 
 ## Device identifier. This must come after all inclusions
-PRODUCT_NAME := lineage_taimen
+PRODUCT_NAME := aicp_taimen
 PRODUCT_BRAND := google
 PRODUCT_MODEL := Pixel 2 XL
 TARGET_MANUFACTURER := LG
diff --git a/lineage.dependencies b/lineage.dependencies
deleted file mode 100644
index 8ea852e..0000000
--- a/lineage.dependencies
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-    {
-        "repository": "android_device_google_wahoo",
-        "target_path": "device/google/wahoo"
-    }
-]
diff --git a/overlay/lineage-sdk/lineage/res/res/values/config.xml b/overlay/lineage-sdk/lineage/res/res/values/config.xml
deleted file mode 100644
index 8cc2a15..0000000
--- a/overlay/lineage-sdk/lineage/res/res/values/config.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 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">
-
-    <!-- The list of vendor package signatures that should also be considered
-         platform signatures, specifically for use on devices with a vendor partition. -->
-    <string-array name="config_vendorPlatformSignatures" translatable="false">
-        <item>308203863082026ea003020102021475dc0fa06d1aa08129f72763d246dbb045688c3a300d06092a864886f70d01010b05003074310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e205669657731143012060355040a130b476f6f676c6520496e632e3110300e060355040b1307416e64726f69643110300e06035504031307416e64726f6964301e170d3137303431393030353031365a170d3437303431393030353031365a3074310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e205669657731143012060355040a130b476f6f676c6520496e632e3110300e060355040b1307416e64726f69643110300e06035504031307416e64726f696430820122300d06092a864886f70d01010105000382010f003082010a0282010100a064f2d1cf7b2465aa5159767e874fcba5fe83195680aecf89bf2ab379994f76b570e25d55f6806752639b6b1d426eb389a8fd3191b476dc642e92d19802ae430e26ca1ee9259ea2bd7b075ddfb84b0e9d1556818ca750658fddbe56eda32de0e231a1cd90ea8ea5c225560aa34f8914fb52645c17139cb01d7e6fafd773cbaeb2ff1e5c06962d9e2279330a705723120ea4bd2768f7ca8c088b5f32475917e1df2a23d3872650c29c1cfaa2f53ad67bf12dd051cf353bc720bf8a0b5fedba82b6cd13b6a44094d062387580f329b3a52724b84863449e93af8d71526330fdcf85463c49e1669bcc44bf589e725528432f1b06f4f2e1134586b73ee4e6c67d7d0203010001a310300e300c0603551d13040530030101ff300d06092a864886f70d01010b0500038201010099b678c502dab172a01df59ec7e3547f3a083958b3a6b42d94be599916f0cfeb67a3575510e3e99f2f5665a68201cd47c218f22737bc21f6a1ec251d8f12e89e49b3c4e08caaa30169801d44f1c5f8b07b251096a83a447fbf951e429ac6bf04ba988636e5a8cb556209f46307c3e4110fc887c2d812ef31f8c4e286a46ec1dfca06e8fd331f785662a87c07ca93ba737d7c8d78a6814f32dc0c62cfa309896ee6c7983fd4b58b2168b3bfecf33656c661fc39ab9effe497a9ea9dc82b88b14227f1ba683918861b9a918e5d726d2b1b9bef3a2c07c8bb5f1ad28d240a6a93bd6a984e75bd9fbff97bfe3c5faace3fa72533fceef61540ccbfa31eb4dc111a0e</item>
-    </string-array>
-
-    <!-- Hardware keys present on the device, stored as a bit field.
-         This integer should equal the sum of the corresponding value for each
-         of the following keys present:
-             1 - Home
-             2 - Back
-             4 - Menu
-             8 - Assistant (search)
-            16 - App switch
-            32 - Camera
-            64 - Volume rocker
-         For example, a device with Home, Back and Menu keys would set this
-         config to 7. -->
-    <integer name="config_deviceHardwareKeys">64</integer>
-
-    <!-- Hardware keys present on the device with the ability to wake, stored as a bit field.
-         This integer should equal the sum of the corresponding value for each
-         of the following keys present:
-             1 - Home
-             2 - Back
-             4 - Menu
-             8 - Assistant (search)
-            16 - App switch
-            32 - Camera
-            64 - Volume rocker
-         For example, a device with Home, Back and Menu keys would set this
-         config to 7. -->
-    <integer name="config_deviceHardwareWakeKeys">64</integer>
-
-    <!-- Define that we use a higher screen ratio (18:9) than standard (16:9) -->
-    <bool name="config_haveHigherAspectRatioScreen">true</bool>
-
-</resources>