land: Remove project pathmap

BoardConfig.mk

@@ -20,8 +20,18 @@
 
 DEVICE_PATH := device/xiaomi/land
 
-# Inherit device-specific board fragments
+# Camera
-include $(DEVICE_PATH)/board/*.mk
+BOARD_QTI_CAMERA_32BIT_ONLY := true
+USE_DEVICE_SPECIFIC_CAMERA := true
+
+# Kernel
+TARGET_KERNEL_CONFIG := lineageos_land_defconfig
+
+# Libinit
+TARGET_LIBINIT_MSM8937_DEFINES_FILE := $(DEVICE_PATH)/libinit/init_land.cpp
+
+# Libshim
+TARGET_LD_SHIM_LIBS := /vendor/bin/mm-qcamera-daemon|vendor/lib/libshims_camera.so
 
 # Inherit the proprietary files
 -include vendor/xiaomi/land/BoardConfigVendor.mk

board/init.mk

@@ -1,2 +0,0 @@
-# Libinit
-TARGET_LIBINIT_MSM8937_DEFINES_FILE := $(DEVICE_PATH)/libinit/init_land.cpp

board/kernel.mk

@@ -1,2 +0,0 @@
-# Kernel
-TARGET_KERNEL_CONFIG := lineageos_land_defconfig

board/libshims.mk

@@ -1,2 +0,0 @@
-# LIBSHIM
-TARGET_LD_SHIM_LIBS := /vendor/bin/mm-qcamera-daemon|vendor/lib/libshims_camera.so

board/qcom-camera.mk

@@ -1,3 +0,0 @@
-# Camera
-BOARD_QTI_CAMERA_32BIT_ONLY := true
-USE_DEVICE_SPECIFIC_CAMERA := true

device.mk

@@ -20,8 +20,25 @@ DEVICE_PATH := device/xiaomi/land
 # Inherit proprietary files
 $(call inherit-product-if-exists, vendor/xiaomi/land/land-vendor.mk)
 
-# Include device-specific product fragments
+# Audio
-include $(DEVICE_PATH)/product/*.mk
+PRODUCT_COPY_FILES += \
+    $(DEVICE_PATH)/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml
+
+# Camera
+PRODUCT_PACKAGES += \
+    camera.msm8937
+
+# Keylayouts
+PRODUCT_COPY_FILES += \
+    $(DEVICE_PATH)/keylayout/ist30xx_ts_input.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/ist30xx_ts_input.kl \
+    $(DEVICE_PATH)/keylayout/msm8952-sku1-snd-card_Button_Jack.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/msm8952-sku1-snd-card_Button_Jack.kl
+
+# Libshim
+PRODUCT_PACKAGES += \
+    libshims_camera
+
+# Properties
+-include $(DEVICE_PATH)/vendor_prop.mk
 
 # Inherit from msm8937-common
 $(call inherit-product, device/xiaomi/msm8937-common/msm8937.mk)

product/keylayout.mk

@@ -1,4 +0,0 @@
-# Keylayouts
-PRODUCT_COPY_FILES += \
-    $(DEVICE_PATH)/keylayout/ist30xx_ts_input.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/ist30xx_ts_input.kl \
-    $(DEVICE_PATH)/keylayout/msm8952-sku1-snd-card_Button_Jack.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/msm8952-sku1-snd-card_Button_Jack.kl

product/qcom-audio.mk

@@ -1,3 +0,0 @@
-# Audio
-PRODUCT_COPY_FILES += \
-    $(DEVICE_PATH)/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml

product/qcom-camera.mk

@@ -1,8 +0,0 @@
-# Camera
-PRODUCT_PACKAGES += \
-    camera.msm8937 \
-    libshims_camera
-
-# Properties
-PRODUCT_PROPERTY_OVERRIDES += \
-    media.camera.ts.monotonic=0

product/qcom-radio.mk

@@ -1,3 +0,0 @@
-# Properties
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.ct.device.model=XMP-2016030

vendor_prop.mk

@@ -0,0 +1,23 @@
+#
+# 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.
+#
+
+# Camera
+PRODUCT_PROPERTY_OVERRIDES += \
+    media.camera.ts.monotonic=0
+
+# Properties
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.ct.device.model=XMP-2016030