land: Move several product and board fragments to common

Change-Id: Iafc70349057d90df68df2d3feafc1f085e90aacc

BoardConfig.mk

@@ -30,7 +30,9 @@ include $(CM_PATH)/common/bootloader.mk
 include $(CM_PATH)/common/camera.mk
 include $(CM_PATH)/common/clang.mk
 include $(CM_PATH)/common/cpusets.mk
+include $(CM_PATH)/common/dexopt.mk
 include $(CM_PATH)/common/dlmalloc.mk
+include $(CM_PATH)/common/filesystem.mk
 include $(CM_PATH)/common/gps.mk
 include $(CM_PATH)/common/sepolicy.mk
 
@@ -38,12 +40,14 @@ include $(CM_PATH)/common/sepolicy.mk
 include $(CM_PATH)/qcom/bluetooth.mk
 include $(CM_PATH)/qcom/bootloader.mk
 include $(CM_PATH)/qcom/cne.mk
+include $(CM_PATH)/qcom/display.mk
 include $(CM_PATH)/qcom/encryption.mk
 include $(CM_PATH)/qcom/fm.mk
 include $(CM_PATH)/qcom/gps.mk
 include $(CM_PATH)/qcom/per-mgr.mk
 include $(CM_PATH)/qcom/platform.mk
 include $(CM_PATH)/qcom/power.mk
+include $(CM_PATH)/qcom/recovery.mk
 include $(CM_PATH)/qcom/ril.mk
 include $(CM_PATH)/qcom/sepolicy.mk
 include $(CM_PATH)/qcom/time.mk

board/dexopt.mk

@@ -1,5 +0,0 @@
-# Dexopt
-ifeq ($(HOST_OS),linux)
-  WITH_DEXPREOPT := true
-  WITH_DEXPREOPT_BOOT_IMG_ONLY := true
-endif

board/filesystem.mk

@@ -7,5 +7,4 @@ BOARD_USERDATAIMAGE_PARTITION_SIZE := 26301931008
 
 BOARD_FLASH_BLOCK_SIZE := 131072
 
-TARGET_USERIMAGES_USE_EXT4 := true
 TARGET_USERIMAGES_USE_F2FS := true

board/qcom-display.mk

@@ -4,7 +4,3 @@ MAX_EGL_CACHE_SIZE := 2048*1024
 NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
 
 OVERRIDE_RS_DRIVER := libRSDriver_adreno.so
-
-TARGET_USES_C2D_COMPOSITION := true
-TARGET_USES_ION := true
-USE_OPENGL_RENDERER := true

board/recovery.mk

@@ -1,5 +1,4 @@
 # Recovery
-TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/fstab.qcom
 TARGET_RECOVERY_UI_LIB := librecovery_ui_msm
 TARGET_RECOVERY_UPDATER_LIBS := librecovery_updater_msm
 TARGET_RELEASETOOLS_EXTENSIONS := device/qcom/common

device.mk

@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+DEVICE_PATH := $(LOCAL_PATH)
 CM_PATH := vendor/cm/config/product
 
 # Overlay
@@ -32,6 +33,8 @@ include $(CM_PATH)/common/gello.mk
 include $(CM_PATH)/common/gps.mk
 include $(CM_PATH)/common/lights.mk
 include $(CM_PATH)/common/media.mk
+include $(CM_PATH)/common/net.mk
+include $(CM_PATH)/common/radio.mk
 include $(CM_PATH)/common/snap.mk
 include $(CM_PATH)/common/wifi.mk
 
@@ -40,8 +43,13 @@ include $(CM_PATH)/qcom/audio.mk
 include $(CM_PATH)/qcom/cne.mk
 include $(CM_PATH)/qcom/display.mk
 include $(CM_PATH)/qcom/fm.mk
+include $(CM_PATH)/qcom/gps.mk
+include $(CM_PATH)/qcom/init.mk
 include $(CM_PATH)/qcom/media.mk
 include $(CM_PATH)/qcom/power.mk
+include $(CM_PATH)/qcom/radio.mk
+include $(CM_PATH)/qcom/sensors.mk
+include $(CM_PATH)/qcom/usb.mk
 include $(CM_PATH)/qcom/wifi.mk
 
 # Include Cyanogen product fragments

product/init.mk

@@ -3,8 +3,4 @@ PRODUCT_PACKAGES += \
     init.qcom.bt.sh
 
 PRODUCT_PACKAGES += \
-    fstab.qcom \
-    init.qcom.rc \
-    init.qcom.sh \
-    init.recovery.qcom.rc \
-    ueventd.qcom.rc
+    init.qcom.sh

product/media.mk

@@ -1,7 +1,3 @@
-# Media
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/media_codecs.xml:system/etc/media_codecs.xml
-
 # Properties
 PRODUCT_PROPERTY_OVERRIDES += \
     mm.enable.smoothstreaming=true \

product/qcom-gps.mk

@@ -2,10 +2,6 @@
 PRODUCT_BOOT_JARS += \
     com.qti.location.sdk
 
-PRODUCT_PACKAGES += \
-    gps.default \
-    libcurl
-
 # Properties
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.gps.qc_nlp_in_use=1 \

product/qcom-net.mk

@@ -1,8 +0,0 @@
-# IPv6
-PRODUCT_PACKAGES += \
-    ebtables \
-    ethertypes
-
-# QMI
-PRODUCT_PACKAGES += \
-    libjson

product/qcom-radio.mk

@@ -29,9 +29,3 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.use_data_netmgrd=true \
     service.qti.ims.enabled=1 \
     telephony.lteOnCdmaDevice=1
-
-# RIL
-PRODUCT_PACKAGES += \
-    libcnefeatureconfig \
-    librmnetctl \
-    libxml2

product/sensors.mk

@@ -1,7 +1,3 @@
-# Sensors
-PRODUCT_PACKAGES += \
-    sensors.msm8937
-
 # Permissions
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:system/etc/permissions/android.hardware.sensor.accelerometer.xml \

product/usb.mk

@@ -1,6 +1,5 @@
 # Init scripts
 PRODUCT_PACKAGES += \
-    init.qcom.usb.rc \
     init.qcom.usb.sh
 
 # Permissions