Berkeley: AICP-ify

Change-Id: I175edf102afbad4642093ca6ddc9f3e611d4aca0

8 files changed, 20 insertions, 13 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 06d56fa..05b1893 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -14,4 +14,4 @@
 # limitations under the License.
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/lineage_berkeley.mk
+    $(LOCAL_DIR)/aicp_berkeley.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 5039ce4..8a91ce1 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -19,4 +19,4 @@
 DEVICE_PATH := device/huawei/berkeley
 
 # Assert
-TARGET_OTA_ASSERT_DEVICE := berkeley,kirin970
+TARGET_OTA_ASSERT_DEVICE := berkeley,kirin970,HWBKL
diff --git a/aicp.dependencies b/aicp.dependencies
new file mode 100644
index 0000000..72d08c4
--- /dev/null
+++ b/aicp.dependencies
@@ -0,0 +1,10 @@
+[
+ {
+   "repository":  "device_huawei_kirin970-common",
+   "target_path": "device/huawei/kirin970-common"
+ },
+ {
+   "repository":  "proprietary_vendor_huawei",
+   "target_path": "vendor/huawei"
+ }
+]
diff --git a/aosip.mk b/aicp_berkeley.mk
index 997cccc..0592a64 100644
--- a/aosip.mk
+++ b/aicp_berkeley.mk
@@ -21,12 +21,16 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 # Inherit from berkeley device
 $(call inherit-product, device/huawei/berkeley/device.mk)
 
-# Inherit some common AOSiP stuff.
-$(call inherit-product, vendor/aosip/config/common_full_phone.mk)
+# Inherit some common AICP stuff.
+$(call inherit-product, vendor/aicp/config/common_full_phone.mk)
 
 # Device identifier. This must come after all inclusions
 PRODUCT_DEVICE := berkeley
-PRODUCT_NAME := aosip_berkeley
+PRODUCT_NAME := aicp_berkeley
 PRODUCT_BRAND := Huawei
 PRODUCT_MANUFACTURER := HUAWEI
 PRODUCT_MODEL := Honor View 10
+
+# AICP Device Maintainers
+PRODUCT_BUILD_PROP_OVERRIDES += \
+    DEVICE_MAINTAINERS="Moshe Barash (mosimchah)"
diff --git a/aosip.dependencies b/aosip.dependencies
deleted file mode 100644
index 53cdf12..0000000
--- a/aosip.dependencies
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  {
-    "repository": "device_huawei_kirin970-common",
-    "target_path": "device/huawei/kirin970-common"
-  }
-]
diff --git a/device.mk b/device.mk
index 0d48925..f94b8fb 100644
--- a/device.mk
+++ b/device.mk
@@ -25,8 +25,7 @@ PRODUCT_AAPT_PREBUILT_DPI := xxhdpi xhdpi hdpi
 
 # Local overlays
 DEVICE_PACKAGE_OVERLAYS += \
-    $(LOCAL_PATH)/overlay \
-    $(LOCAL_PATH)/overlay-lineage
+    $(LOCAL_PATH)/overlay
 
 # Boot animation
 TARGET_SCREEN_HEIGHT := 2160
diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 713c422..713c422 100644
--- a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
diff --git a/overlay-lineage/packages/apps/Settings/res/values/config.xml b/overlay/packages/apps/Settings/res/values/config.xml
index 026681a..026681a 100644
--- a/overlay-lineage/packages/apps/Settings/res/values/config.xml
+++ b/overlay/packages/apps/Settings/res/values/config.xml