aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita <nikich340@gmail.com>2016-02-12 08:15:21 +1000
committerNikita <nikich340@gmail.com>2016-02-12 08:15:21 +1000
commit79d1e6fabd2181d3ec272f2fb0061a9d48e6d33a (patch)
tree9359429c04a22bc3c189ec70b65a5bacabb450ef
parent9040ccbb761dcdfef34010498fa5488076c1f4dd (diff)
Drop full_<device>.mk
Change-Id: I0f5154a93752d554d768c2be2d7428a1465b5cd6
-rw-r--r--AndroidProducts.mk2
-rw-r--r--cm.mk8
-rw-r--r--full_g2m.mk26
3 files changed, 5 insertions, 31 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
deleted file mode 100644
index 634dbcf..0000000
--- a/AndroidProducts.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-PRODUCT_MAKEFILES := \
- $(LOCAL_DIR)/full_g2m.mk
diff --git a/cm.mk b/cm.mk
index 442e58d..80ba3d1 100644
--- a/cm.mk
+++ b/cm.mk
@@ -1,5 +1,7 @@
# Inherit some common CM stuff.
$(call inherit-product, vendor/cm/config/common_full_phone.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
+$(call inherit-product, device/lge/g2m/device_g2m.mk)
# Boot animation
TARGET_SCREEN_WIDTH := 540
@@ -8,7 +10,7 @@ TARGET_SCREEN_HEIGHT := 960
# Release name
PRODUCT_RELEASE_NAME := LG G2 Mini
PRODUCT_NAME := cm_g2m
-PRODUCT_MANUFACTURER := lge
PRODUCT_MODEL := g2m
-
-$(call inherit-product, device/lge/g2m/full_g2m.mk)
+PRODUCT_DEVICE := g2m
+PRODUCT_MANUFACTURER := LGE
+PRODUCT_BRAND := lge
diff --git a/full_g2m.mk b/full_g2m.mk
deleted file mode 100644
index ee43b00..0000000
--- a/full_g2m.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright (C) 2014 The CyanogenMod 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.
-#
-
-# Inherit from those products. Most specific first.
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
-$(call inherit-product, device/lge/g2m/device_g2m.mk)
-
-## Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := g2m
-PRODUCT_NAME := full_g2m
-PRODUCT_BRAND := lge
-PRODUCT_MODEL := g2m
-PRODUCT_MANUFACTURER := LGE