aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@gmail.com>2015-08-22 18:16:23 +0300
committerMichael Bestas <mikeioannina@gmail.com>2015-08-22 18:16:23 +0300
commit2230506ea4abb84535228d92c3c69c759b4fbc43 (patch)
treeaad983bde46ab29d2439dcbe3a2a2772d6bcc633
parent0e66b5fee5357882b5dc6db5a29ce3b2963a18fb (diff)
find7: Cleanup makefiles
Change-Id: I8945be9b566f5b39aa714c44ba9e9c15db7b2077
-rw-r--r--cm.mk20
-rw-r--r--full_find7.mk26
2 files changed, 19 insertions, 27 deletions
diff --git a/cm.mk b/cm.mk
index 97f585f..5cec2a1 100644
--- a/cm.mk
+++ b/cm.mk
@@ -1,13 +1,31 @@
-$(call inherit-product, device/oppo/find7/full_find7.mk)
+# Copyright (C) 2014-2015 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.
+
+$(call inherit-product, device/oppo/find7/find7.mk)
# Enhanced NFC
$(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
# 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)
PRODUCT_NAME := cm_find7
PRODUCT_DEVICE := find7
+PRODUCT_BRAND := OPPO
+PRODUCT_MANUFACTURER := OPPO
+PRODUCT_MODEL := Find7
PRODUCT_GMS_CLIENTID_BASE := android-oppo
diff --git a/full_find7.mk b/full_find7.mk
deleted file mode 100644
index 1ca8916..0000000
--- a/full_find7.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)
-
-# Inherit from find7 device
-$(call inherit-product, device/oppo/find7/find7.mk)
-
-# Discard inherited values and use our own instead.
-PRODUCT_NAME := full_find7
-PRODUCT_DEVICE := find7
-PRODUCT_BRAND := OPPO
-PRODUCT_MANUFACTURER := OPPO
-PRODUCT_MODEL := Find7