P5100: device tree cleanup

Only cosmetical changes
- fix some typos
- use aosp instead full makefile
- remove unused CleanSpec.mk

Change-Id: I70932f8c3b5d033215fd902daeac4c76b081c949

5 files changed, 21 insertions, 81 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 9d6c4ac..fbfc0e5 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,4 +15,5 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/full_p5100.mk
+    $(LOCAL_DIR)/aosp_p5100.mk \
+    $(LOCAL_DIR)/cm.mk
diff --git a/CleanSpec.mk b/CleanSpec.mk
deleted file mode 100644
index a2973c7..0000000
--- a/CleanSpec.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright (C) 2007 The Android Open Source 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.
-#
-
-# If you don't need to do a full clean build but would like to touch
-# a file or delete some intermediate files, add a clean step to the end
-# of the list.  These steps will only be run once, if they haven't been
-# run before.
-#
-# E.g.:
-#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
-#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
-#
-# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
-# files that are missing or have been moved.
-#
-# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
-# Use $(OUT_DIR) to refer to the "out" directory.
-#
-# If you need to re-do something that's already mentioned, just copy
-# the command and add it to the bottom of the list.  E.g., if a change
-# that you made last week required touching a file and a change you
-# made today requires touching the same file, just copy the old
-# touch step and add it to the end of the list.
-#
-# ************************************************
-# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
-# ************************************************
-
-# For example:
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
-#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
-#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
-$(call add-clean-step, find $(PRODUCT_OUT) -name "*.apk" | xargs rm)
-
-# ************************************************
-# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
-# ************************************************
-$(call add-clean-step, rm -rf $(TARGET_OUT)/build.prop)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/p5100/obj/SHARED_LIBRARIES/libaudio_intermediates)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/p5100/obj/SHARED_LIBRARIES/libaudio_intermediates)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/p5100/obj/STATIC_LIBRARIES/libasound_intermediates)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/p5100/obj/EXECUTABLES/alsa_*)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/p5100/system/bin/alsa_*)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/p5100/system/etc/asound.conf)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/p5100/system/usr/share/alsa)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/p5100/obj/PACKAGING/systemimage_intermediates)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/p5100/obj/SHARED_LIBRARIES/libaudio_intermediates)
diff --git a/full_p5100.mk b/aosp_p5100.mk
index 7d1f288..fcbdb64 100644
--- a/full_p5100.mk
+++ b/aosp_p5100.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2012 The CyanogenMod Project
+# Copyright 2013 The Android Open-Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,13 +17,18 @@
 # Use 44.1 kHz UI sounds
 $(call inherit-product-if-exists, frameworks/base/data/sounds/AudioPackage13.mk)
 
-# Inherit from those products. Most specific first.
+# Inherit from the common Open Source product configuration
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
-$(call inherit-product, device/samsung/p5100/p5100.mk)
 
-# Discard inherited values and use our own instead.
-PRODUCT_NAME := full_p5100
+# Inherit device specific configuration
+$(call inherit-product, device/samsung/p5100/device.mk)
+
 PRODUCT_DEVICE := p5100
-PRODUCT_BRAND := samsung
-PRODUCT_MANUFACTURER := samsung
+PRODUCT_NAME := aosp_p5100
+PRODUCT_BRAND := Android
 PRODUCT_MODEL := GT-P5100
+PRODUCT_MANUFACTURER := Samsung
+
+PRODUCT_BUILD_PROP_OVERRIDES += \
+    PRODUCT_NAME=espresso10rfxx \
+    TARGET_DEVICE=espresso10rf
diff --git a/cm.mk b/cm.mk
index c096a52..cd9e966 100644
--- a/cm.mk
+++ b/cm.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2012 The CyanogenMod Project
+# Copyright (C) 2016 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.
@@ -22,26 +22,20 @@ PRODUCT_RELEASE_NAME := p5100
 TARGET_SCREEN_HEIGHT := 480
 TARGET_SCREEN_WIDTH := 1280
 
-# Inherit some common CM stuff.
+# Inherit common CM configuration
 $(call inherit-product, vendor/cm/config/common_full_phone.mk)
 
-# Inherit device configuration
-$(call inherit-product, device/samsung/p5100/full_p5100.mk)
-
 # CyanogenMod specific overlay
 DEVICE_PACKAGE_OVERLAYS += device/samsung/p5100/overlay/cm
 DEVICE_PACKAGE_OVERLAYS += device/samsung/espresso-common/overlay/cm-common
 
-## Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := p5100
+# Inherit device specific configuration
+$(call inherit-product, device/samsung/p5100/aosp_p5100.mk)
+
+# Device identifier. This must come after all inclusions
 PRODUCT_NAME := cm_p5100
-PRODUCT_BRAND := samsung
-PRODUCT_MODEL := GT-P5100
-PRODUCT_MANUFACTURER := samsung
 
-#Set build fingerprint / ID / Prduct Name ect.
+# Set build fingerprint / ID / Product Name etc.
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    PRODUCT_NAME=espresso10rfxx \
-    TARGET_DEVICE=espresso10rf \
     BUILD_FINGERPRINT="samsung/espresso10rfxx/espresso10rf:4.2.2/JDQ39/P5100XXDNA1:user/release-keys" \
     PRIVATE_BUILD_DESC="espresso10rfxx-user 4.2.2 JDQ39 P5100XXDNA1 release-keys"
diff --git a/p5100.mk b/device.mk
index 8f1c7e8..8f1c7e8 100644
--- a/p5100.mk
+++ b/device.mk