From a4017cf8417855494cf0c487589f957be9a5716f Mon Sep 17 00:00:00 2001 From: Isaac Chen Date: Fri, 22 Jun 2018 09:27:24 +0200 Subject: [PATCH] land: Remove project pathmap --- BoardConfig.mk | 14 ++++++++++++-- board/init.mk | 2 -- board/kernel.mk | 2 -- board/libshims.mk | 2 -- board/qcom-camera.mk | 3 --- device.mk | 21 +++++++++++++++++++-- product/keylayout.mk | 4 ---- product/qcom-audio.mk | 3 --- product/qcom-camera.mk | 8 -------- product/qcom-radio.mk | 3 --- vendor_prop.mk | 23 +++++++++++++++++++++++ 11 files changed, 54 insertions(+), 31 deletions(-) delete mode 100644 board/init.mk delete mode 100644 board/kernel.mk delete mode 100644 board/libshims.mk delete mode 100644 board/qcom-camera.mk delete mode 100644 product/keylayout.mk delete mode 100644 product/qcom-audio.mk delete mode 100644 product/qcom-camera.mk delete mode 100644 product/qcom-radio.mk create mode 100644 vendor_prop.mk diff --git a/BoardConfig.mk b/BoardConfig.mk index e5bd9e1..8afe11d 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -20,8 +20,18 @@ DEVICE_PATH := device/xiaomi/land -# Inherit device-specific board fragments -include $(DEVICE_PATH)/board/*.mk +# Camera +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 diff --git a/board/init.mk b/board/init.mk deleted file mode 100644 index 32ac697..0000000 --- a/board/init.mk +++ /dev/null @@ -1,2 +0,0 @@ -# Libinit -TARGET_LIBINIT_MSM8937_DEFINES_FILE := $(DEVICE_PATH)/libinit/init_land.cpp diff --git a/board/kernel.mk b/board/kernel.mk deleted file mode 100644 index 2111571..0000000 --- a/board/kernel.mk +++ /dev/null @@ -1,2 +0,0 @@ -# Kernel -TARGET_KERNEL_CONFIG := lineageos_land_defconfig diff --git a/board/libshims.mk b/board/libshims.mk deleted file mode 100644 index d39612c..0000000 --- a/board/libshims.mk +++ /dev/null @@ -1,2 +0,0 @@ -# LIBSHIM -TARGET_LD_SHIM_LIBS := /vendor/bin/mm-qcamera-daemon|vendor/lib/libshims_camera.so diff --git a/board/qcom-camera.mk b/board/qcom-camera.mk deleted file mode 100644 index f7af579..0000000 --- a/board/qcom-camera.mk +++ /dev/null @@ -1,3 +0,0 @@ -# Camera -BOARD_QTI_CAMERA_32BIT_ONLY := true -USE_DEVICE_SPECIFIC_CAMERA := true diff --git a/device.mk b/device.mk index 5a5d9d7..8ab68b5 100644 --- a/device.mk +++ b/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 -include $(DEVICE_PATH)/product/*.mk +# Audio +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) diff --git a/product/keylayout.mk b/product/keylayout.mk deleted file mode 100644 index 6f8e076..0000000 --- a/product/keylayout.mk +++ /dev/null @@ -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 diff --git a/product/qcom-audio.mk b/product/qcom-audio.mk deleted file mode 100644 index 2aeb8bf..0000000 --- a/product/qcom-audio.mk +++ /dev/null @@ -1,3 +0,0 @@ -# Audio -PRODUCT_COPY_FILES += \ - $(DEVICE_PATH)/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml diff --git a/product/qcom-camera.mk b/product/qcom-camera.mk deleted file mode 100644 index 65c267e..0000000 --- a/product/qcom-camera.mk +++ /dev/null @@ -1,8 +0,0 @@ -# Camera -PRODUCT_PACKAGES += \ - camera.msm8937 \ - libshims_camera - -# Properties -PRODUCT_PROPERTY_OVERRIDES += \ - media.camera.ts.monotonic=0 diff --git a/product/qcom-radio.mk b/product/qcom-radio.mk deleted file mode 100644 index a4755ba..0000000 --- a/product/qcom-radio.mk +++ /dev/null @@ -1,3 +0,0 @@ -# Properties -PRODUCT_PROPERTY_OVERRIDES += \ - ro.ct.device.model=XMP-2016030 diff --git a/vendor_prop.mk b/vendor_prop.mk new file mode 100644 index 0000000..bcb0091 --- /dev/null +++ b/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