changes for AOSP building

BoardConfig.mk

@@ -43,7 +43,6 @@ TARGET_KERNEL_SOURCE := kernel/amazon/otter
 TARGET_KERNEL_CONFIG := otter_android_defconfig
 TARGET_PREBUILT_KERNEL := device/amazon/otter/kernel
 
-ifdef CM_BUILD
 WLAN_MODULES:
 	make clean -C hardware/ti/wlan/mac80211/compat_wl12xx
 	make -j8 -C hardware/ti/wlan/mac80211/compat_wl12xx KERNEL_DIR=$(KERNEL_OUT) KLIB=$(KERNEL_OUT) KLIB_BUILD=$(KERNEL_OUT) ARCH=arm CROSS_COMPILE="arm-eabi-"
@@ -55,7 +54,6 @@ WLAN_MODULES:
 	mv hardware/ti/wlan/mac80211/compat_wl12xx/drivers/net/wireless/wl12xx/wl12xx_sdio.ko $(KERNEL_MODULES_OUT)
 
 TARGET_KERNEL_MODULES += WLAN_MODULES
-endif
 
 # Filesystem
 TARGET_USERIMAGES_USE_EXT4 := true
@@ -95,7 +93,10 @@ USE_OPENGL_RENDERER := true
 TARGET_PROVIDES_RELEASETOOLS := true
 TARGET_RELEASETOOL_OTA_FROM_TARGET_SCRIPT := device/amazon/otter/releasetools/otter_ota_from_target_files
 TARGET_RELEASETOOL_IMG_FROM_TARGET_SCRIPT := device/amazon/otter/releasetools/otter_img_from_target_files
+
+ifneq ($(TARGET_PRODUCT),full_maserati)
 TARGET_CUSTOM_RELEASETOOL := ./device/amazon/otter/releasetools/squisher
+endif
 
 # Recovery
 TARGET_PREBUILT_RECOVERY_KERNEL := device/amazon/otter/recovery-kernel

device.mk

@@ -126,25 +126,18 @@ PRODUCT_PACKAGES += \
     com.android.future.usb.accessory \
 
 # AOSP specific
-ifndef CM_BUILD
-
-# copy all kernel modules under the "modules" directory to system/lib/modules
-PRODUCT_COPY_FILES += $(shell \
-    find $(DEVICE_FOLDER)/modules -name '*.ko' \
-    | sed -r 's/^\/?(.*\/)([^/ ]+)$$/\1\2:system\/lib\/modules\/\2/' \
-    | tr '\n' ' ')
+ifeq ($(TARGET_PRODUCT),full_maserati)
 
 # Prebuilt /system/media
 PRODUCT_COPY_FILES += \
     $(DEVICE_FOLDER)/prebuilt/media/bootanimation.zip:/system/media/bootanimation.zip \
 
-else
+endif
+
 PRODUCT_PACKAGES += \
     Superuser \
     su \
 
-endif
-
 PRODUCT_PROPERTY_OVERRIDES := \
     ro.sf.lcd_density=160 \
     dalvik.vm.heapstartsize=5m \