summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Martins <bgcngm@gmail.com>2018-08-10 13:47:04 +0100
committerLuK1337 <priv.luk@gmail.com>2018-08-14 18:11:35 +0200
commit606ee4b599246a1d360d7932c08c21e2a9c29f9f (patch)
tree5c30cd53d0a33770840868a4a47326dfb51b79a8
parent05296776338ce6698ddb089da927dcc901f64b46 (diff)
berkeley: Consider lineage_berkeley product via the AOSP way
Change-Id: Ibdeb62f0aa30933a09ac12ca825025e5f18574ab
-rw-r--r--AndroidProducts.mk2
-rw-r--r--lineage.mk25
-rw-r--r--lineage_berkeley.mk (renamed from full_berkeley.mk)5
3 files changed, 5 insertions, 27 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 3fa7e4b..06d56fa 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -14,4 +14,4 @@
# limitations under the License.
PRODUCT_MAKEFILES := \
- $(LOCAL_DIR)/full_berkeley.mk
+ $(LOCAL_DIR)/lineage_berkeley.mk
diff --git a/lineage.mk b/lineage.mk
deleted file mode 100644
index 9c0edeb..0000000
--- a/lineage.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 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.
-#
-
-$(call inherit-product, device/huawei/berkeley/full_berkeley.mk)
-
-# Inherit some common Lineage stuff.
-$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
-
-PRODUCT_NAME := lineage_berkeley
-PRODUCT_DEVICE := berkeley
-PRODUCT_BRAND := Huawei
-PRODUCT_MODEL := Honor View 10
diff --git a/full_berkeley.mk b/lineage_berkeley.mk
index 7dc6ac9..dfbaada 100644
--- a/full_berkeley.mk
+++ b/lineage_berkeley.mk
@@ -22,8 +22,11 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/treble_common.mk)
# Inherit from berkeley device
$(call inherit-product, device/huawei/berkeley/device.mk)
+# Inherit some common Lineage stuff.
+$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
+
# Device identifier. This must come after all inclusions
PRODUCT_DEVICE := berkeley
-PRODUCT_NAME := full_berkeley
+PRODUCT_NAME := lineage_berkeley
PRODUCT_BRAND := Huawei
PRODUCT_MODEL := berkeley