Skip to content

Commit

Permalink
Reorder variable options and cleanup
Browse files Browse the repository at this point in the history 
Conflicts:
	BoardConfig.mk
	full_jordan.mk
	jordan.mk

Change-Id: I9caf12553fd240a592f853a6de0a6977af9bc6b7
  • Loading branch information
@tpruvot
tpruvot committed Feb 19, 2012
1 parent a5591fb commit 54dca36
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 224 deletions.
82 changes: 34 additions & 48 deletions BoardConfig.mk
View file
Expand Up @@ -30,7 +30,6 @@ BOARD_DEFY_MODEL := DEFY_FROYO
USE_CAMERA_STUB := false
BOARD_USES_GENERIC_AUDIO := false

TARGET_NO_RECOVERY := false
TARGET_NO_RADIOIMAGE := true
TARGET_NO_BOOTLOADER := true
TARGET_NO_PREINSTALL := true
Expand Down Expand Up @@ -70,63 +69,55 @@ WIFI_AP_DRIVER_MODULE_ARG := ""
BOARD_HOSTAPD_DRIVER := true
BOARD_HOSTAPD_DRIVER_NAME := wilink

BOARD_USE_YUV422I_DEFAULT_COLORFORMAT := true
BOARD_EGL_CFG := device/motorola/jordan/egl.cfg
DEFAULT_FB_NUM := 0

BOARD_CUSTOM_USB_CONTROLLER := ../../device/motorola/jordan/UsbController.cpp

# Bluetooth
BOARD_HAVE_BLUETOOTH := true
TARGET_CUSTOM_BLUEDROID := ../../../device/motorola/jordan/bluedroid.c

# Usb Specific
BOARD_CUSTOM_USB_CONTROLLER := ../../device/motorola/jordan/UsbController.cpp
BOARD_USE_USB_MASS_STORAGE_SWITCH := true
BOARD_MASS_STORAGE_FILE_PATH := "/sys/devices/platform/usb_mass_storage/lun0/file"
TARGET_USE_CUSTOM_LUN_FILE_PATH := "/sys/devices/platform/usb_mass_storage/lun0/file"
BOARD_MTP_DEVICE := "/dev/mtp"

# Build options
BOARD_BOOTIMAGE_MAX_SIZE := $(call image-size-from-data-size,0x00280000)
BOARD_RECOVERYIMAGE_MAX_SIZE := $(call image-size-from-data-size,0x00500000)
BOARD_SYSTEMIMAGE_MAX_SIZE := $(call image-size-from-data-size,0x07500000)
BOARD_USERDATAIMAGE_MAX_SIZE := $(call image-size-from-data-size,0x04ac0000)
BOARD_FLASH_BLOCK_SIZE := 131072
TARGET_CUSTOM_RELEASETOOL := ./device/motorola/jordan/releasetools/squisher

# OMX Stuff
HARDWARE_OMX := true
TARGET_USE_OMX_RECOVERY := true
TARGET_USE_OMAP_COMPAT := true
BUILD_WITH_TI_AUDIO := 1
BUILD_PV_VIDEO_ENCODERS := 1

BOARD_USE_USB_MASS_STORAGE_SWITCH := true
BOARD_NO_RGBX_8888 := true
BOARD_USE_KINETO_COMPATIBILITY := true

# Changes related to bootmenu
# Bootmenu
BOARD_USES_BOOTMENU := true

# Recovery
TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
BOARD_CUSTOM_RECOVERY_KEYMAPPING:= ../../device/motorola/jordan/recovery_ui.c
BOARD_HAS_NO_MISC_PARTITION := true
BOARD_RECOVERY_IGNORE_BOOTABLES := true
BOARD_HAS_SMALL_RECOVERY := true
BOARD_HAS_LARGE_FILESYSTEM := true
BOARD_HAS_NO_SELECT_BUTTON := true

BOARD_SDCARD_DEVICE_PRIMARY := /dev/block/mmcblk0p1
BOARD_SDCARD_DEVICE_SECONDARY := /dev/block/mmcblk0
BOARD_SDEXT_DEVICE := /dev/block/mmcblk0p2
BOARD_SYSTEM_DEVICE := /dev/block/mmcblk1p21
BOARD_DATA_DEVICE := /dev/block/mmcblk1p25

# Reboot mode for reboot menu, but only handle recovery, not bootmenu :(
TARGET_RECOVERY_PRE_COMMAND := "/system/bootmenu/script/reboot_command.sh"
TARGET_RECOVERY_PRE_COMMAND_CLEAR_REASON := true

# Recovery
TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
BOARD_RECOVERY_IGNORE_BOOTABLES := true
BOARD_HAS_NO_MISC_PARTITION := true
BOARD_HAS_NO_SELECT_BUTTON := true
BOARD_HAS_SMALL_RECOVERY := true
BOARD_HAS_LARGE_FILESYSTEM := true
BOARD_NEVER_UMOUNT_SYSTEM := true
BOARD_CUSTOM_RECOVERY_KEYMAPPING:= ../../device/motorola/jordan/recovery_keys.c
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext3
TARGET_USERIMAGES_USE_EXT4 := false
#TARGET_RECOVERY_UI_LIB := librecovery_ui_generic
#TARGET_RECOVERY_UPDATER_LIBS += librecovery_updater_generic

# Override cyanogen squisher to customize our update zip package
TARGET_CUSTOM_RELEASETOOL := ./device/motorola/jordan/releasetools/squisher
TARGET_RECOVERY_PRE_COMMAND := "/system/bootmenu/script/reboot_command.sh"
TARGET_RECOVERY_PRE_COMMAND_CLEAR_REASON := true

# Jordan need 2nd-init binary from motorola common
TARGET_NEEDS_MOTOROLA_HIJACK := true
Expand All @@ -136,33 +127,28 @@ TARGET_NEEDS_MOTOROLA_HIJACK := true
# BOARD_FM_DEVICE := wl1271
# COMMON_GLOBAL_CFLAGS += -DHAVE_FM_RADIO

# Gingerbread kernel specifics
ifeq ($(BOARD_DEFY_MODEL),DEFY_PLUS)
BOARD_USE_CID_ROTATE_34 := true
endif

## ICS specifics

BOARD_USES_OVERLAY := true
#BOARD_USES_HGL := true
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext3
TARGET_USERIMAGES_USE_EXT4 := false

# Egl Specific
#USE_OPENGL_RENDERER := true
BOARD_EGL_CFG := device/motorola/jordan/egl.cfg
DEFAULT_FB_NUM := 0
BOARD_USE_YUV422I_DEFAULT_COLORFORMAT := true
BOARD_NO_RGBX_8888 := true
BOARD_USES_OVERLAY := true
COMMON_GLOBAL_CFLAGS += -DMISSING_EGL_EXTERNAL_IMAGE -DMISSING_EGL_PIXEL_FORMAT_YV12
COMMON_GLOBAL_CFLAGS += -DMISSING_GRALLOC_BUFFERS
BOARD_QCOM_BASED_CAMERA_HAL := true
BOARD_LIBUI_USE_OVERLAY_CPP := true

# CM9
BOARD_CUSTOM_RECOVERY_KEYMAPPING:= ../../device/motorola/jordan/recovery_keys.c

# Other..
BOARD_USE_LEGACY_TOUCHSCREEN := true
ENABLE_SENSORS_COMPAT := true
TARGET_PROXIMITY_SENSOR_LIMIT := 0x1F
#segfault: TARGET_USES_OLD_LIBSENSORS_HAL := true

BOARD_USES_AUDIO_LEGACY := true
BOARD_USE_LEGACY_TOUCHSCREEN := true
TARGET_PROVIDES_LIBAUDIO := true
BOARD_USES_GPSSHIM := false
BOARD_USE_KINETO_COMPATIBILITY := true

# Recent gingerbread kernel specific, to double check (Defy+)
ifeq ($(BOARD_DEFY_MODEL),DEFY_PLUS)
BOARD_USE_CID_ROTATE_34 := true
endif

17 changes: 2 additions & 15 deletions full_jordan.mk
View file
Expand Up @@ -21,28 +21,15 @@
# lines, full and toro, hence its name.
#

# Live Wallpapers
PRODUCT_PACKAGES += \
LiveWallpapers \
LiveWallpapersPicker \
MagicSmokeWallpapers \
VisualizationWallpapers \
librs_jni

PRODUCT_PROPERTY_OVERRIDES := \
net.dns1=8.8.8.8 \
net.dns2=8.8.4.4

# Inherit from those products. Most specific first.
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
$(call inherit-product, frameworks/base/build/phone-hdpi-512-dalvik-heap.mk)
$(call inherit-product, device/motorola/jordan/jordan.mk)
$(call inherit-product-if-exists, vendor/ti/proprietary/omap3/ti-omap3-vendor.mk)
# Also get non-open-source files if available
$(call inherit-product-if-exists, vendor/motorola/jordan/jordan-vendor.mk)

PRODUCT_NAME := full_jordan
PRODUCT_DEVICE := jordan
PRODUCT_BRAND := Android
PRODUCT_MODEL := MB526
PRODUCT_MODEL := MB525
PRODUCT_MANUFACTURER := motorola
13 changes: 5 additions & 8 deletions jordan-blobs.mk
View file
Expand Up @@ -16,11 +16,11 @@ DEVICE_PREBUILT := device/motorola/jordan/prebuilt

#temporary cm9 bootanimation
PRODUCT_COPY_FILES += \
$(DEVICE_PREBUILT)/bootanimation.zip:system/media/bootanimation.zip \
$(DEVICE_PREBUILT)/bootanimation.zip:system/media/bootanimation.zip

PRODUCT_COPY_FILES += \
$(DEVICE_PREBUILT)/etc/terminfo/l/linux:system/etc/terminfo/l/linux \
$(DEVICE_PREBUILT)/etc/terminfo/x/xterm:system/etc/terminfo/x/xterm \
$(DEVICE_PREBUILT)/etc/terminfo/x/xterm:system/etc/terminfo/x/xterm

#key layouts, names must fit the ones in /proc/bus/input/devices, qwerty.kl is the fallback one.
PRODUCT_COPY_FILES += \
Expand All @@ -37,7 +37,7 @@ PRODUCT_COPY_FILES += \
$(DEVICE_PREBUILT)/usr/keypad.kl:system/usr/keylayout/sholes-keypad.kl \
$(DEVICE_PREBUILT)/usr/keypad.kl:system/usr/keylayout/umts_jordan-keypad.kl \
$(DEVICE_PREBUILT)/usr/cpcap-key.kl:system/usr/keylayout/cpcap-key.kl \
$(DEVICE_PREBUILT)/usr/keychars/cpcap-key.kcm:system/usr/keychars/cpcap-key.kcm \
$(DEVICE_PREBUILT)/usr/keychars/cpcap-key.kcm:system/usr/keychars/cpcap-key.kcm


PRODUCT_COPY_FILES += \
Expand All @@ -59,18 +59,15 @@ PRODUCT_COPY_FILES += \
$(DEVICE_PREBUILT)/etc/wifi/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf \
$(DEVICE_PREBUILT)/etc/gpsconfig.xml:system/etc/gpsconfig.xml \
$(DEVICE_PREBUILT)/etc/location.cfg:system/etc/location.cfg \
device/motorola/jordan/vold.fstab:system/etc/vold.fstab \
device/motorola/jordan/media_profiles.xml:system/etc/media_profiles.xml \
device/motorola/jordan/modules/modules.alias:system/lib/modules/modules.alias \
device/motorola/jordan/modules/modules.dep:system/lib/modules/modules.dep \
device/motorola/jordan/modules/modules.dep:system/lib/modules/modules.dep

ifdef CM_RELEASE
PRODUCT_COPY_FILES += device/motorola/jordan/custom_backup_release.txt:system/etc/custom_backup_list.txt
else
PRODUCT_COPY_FILES += device/motorola/jordan/custom_backup_list.txt:system/etc/custom_backup_list.txt
endif

#app
PRODUCT_COPY_FILES += \
device/motorola/jordan/prebuilt/app/basebandswitcherV4.0.apk:system/app/basebandswitcherV4.0.apk \

#end of jordan-blobs.mk
83 changes: 24 additions & 59 deletions jordan.mk
View file
Expand Up @@ -21,11 +21,6 @@
# The gps config appropriate for this device
$(call inherit-product, device/common/gps/gps_eu_supl.mk)

## (1) First, the most specific values, i.e. the aspects that are specific to GSM

## (2) Also get non-open-source files if available (made after in full_jordan.mk)
$(call inherit-product-if-exists, vendor/motorola/jordan/jordan-vendor.mk)

## (3) Finally, the least specific parts, i.e. the non-GSM-specific aspects
PRODUCT_PROPERTY_OVERRIDES += \
ro.media.capture.maxres=5m \
Expand All @@ -39,15 +34,20 @@ PRODUCT_PROPERTY_OVERRIDES += \
ro.telephony.call_ring.delay=3000 \
ro.url.safetylegal=http://www.motorola.com/staticfiles/Support/legal/?model=MB525 \
ro.media.dec.jpeg.memcap=20000000 \
ro.media.dec.aud.wma.enabled=1 \
ro.media.dec.vid.wmv.enabled=1 \
dalvik.vm.lockprof.threshold=500 \
ro.kernel.android.checkjni=0 \
dalvik.vm.checkjni=false \
dalvik.vm.dexopt-data-only=1 \
ro.vold.umsdirtyratio=20
ro.vold.umsdirtyratio=20 \
net.dns1=8.8.8.8 \
net.dns2=8.8.4.4

# we have enough storage space to hold precise GC data
PRODUCT_TAGS += dalvik.gc.type-precise

DEVICE_PACKAGE_OVERLAYS += device/motorola/jordan/overlay

# Permissions
PRODUCT_COPY_FILES += \
frameworks/base/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
frameworks/base/data/etc/android.hardware.camera.flash-autofocus.xml:system/etc/permissions/android.hardware.camera.flash-autofocus.xml \
Expand All @@ -62,12 +62,13 @@ PRODUCT_COPY_FILES += \
frameworks/base/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \
frameworks/base/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
frameworks/base/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:/system/etc/permissions/android.software.live_wallpaper.xml \

# ICS sound
PRODUCT_PACKAGES += \
hcitool hciattach hcidump \
libaudioutils audio.a2dp.default audio_policy.jordan \
libaudiohw_legacy audio.primary.omap3
libaudiohw_legacy audio.primary.omap3 \

# ICS graphics
PRODUCT_PACKAGES += libGLESv2 libEGL libGLESv1_CM
Expand All @@ -85,37 +86,26 @@ PRODUCT_PACKAGES += libhostapdcli libCustomWifi libwpa_client libtiOsLib
PRODUCT_PACKAGES += tiwlan.ini dhcpcd.conf wpa_supplicant.conf hostapd.conf
PRODUCT_PACKAGES += tiap_loader tiap_cu ndc

# Various packages
PRODUCT_PACKAGES += \
librs_jni \
dspexec \
libbridge \
libOMX.TI.AAC.encode \
libOMX.TI.AAC.decode \
libOMX.TI.AMR.decode \
libOMX.TI.AMR.encode \
libOMX.TI.WBAMR.encode \
libOMX.TI.MP3.decode \
libOMX.TI.WBAMR.decode \
libOMX.TI.WMA.decode \
libOMX.TI.Video.Decoder \
libOMX.TI.Video.encoder \
libLCML \
libOMX_Core \
libfnc \
DefyParts \
Usb \
Superuser \
su

# for jpeg hw encoder/decoder
PRODUCT_PACKAGES += libskiahw libOMX.TI.JPEG.Encoder libOMX.TI.JPEG.decoder libstagefrighthw

# video post processor
# OMX stuff
PRODUCT_PACKAGES += dspexec libbridge libLCML libOMX_Core
PRODUCT_PACKAGES += libOMX.TI.AAC.encode libOMX.TI.AAC.decode libOMX.TI.AMR.decode
PRODUCT_PACKAGES += libOMX.TI.WBAMR.encode libOMX.TI.MP3.decode libOMX.TI.WBAMR.decode
PRODUCT_PACKAGES += libOMX.TI.WMA.decode libOMX.TI.Video.Decoder libOMX.TI.Video.encoder
PRODUCT_PACKAGES += libOMX.TI.VPP
#PRODUCT_PACKAGES += libskiahw libOMX.TI.JPEG.Encoder libOMX.TI.JPEG.decoder

# Defy stuff
PRODUCT_PACKAGES += libfnc DefyParts Usb

PRODUCT_PACKAGES += e2fsck

# Publish that we support the live wallpaper feature.
PRODUCT_PACKAGES += LiveWallpapers LiveWallpapersPicker MagicSmokeWallpapers
PRODUCT_PACKAGES += VisualizationWallpapers librs_jni

# Add DroidSSHd (dropbear) Management App - tpruvot/android_external_droidsshd @ github
PRODUCT_PACKAGES += DroidSSHd dropbear dropbearkey sftp-server scp ssh
PRODUCT_PACKAGES += RomUpdater
Expand All @@ -124,13 +114,6 @@ PRODUCT_PACKAGES += RomUpdater
PRODUCT_PACKAGES += Trebuchet FileManager Torch
#PRODUCT_PACKAGES += DSPManager libcyanogen-dsp


# we have enough storage space to hold precise GC data
PRODUCT_TAGS += dalvik.gc.type-precise

PRODUCT_COPY_FILES += \
device/motorola/jordan/vold.fstab:system/etc/vold.fstab

# copy all vendor (motorola) kernel modules to system/lib/modules
PRODUCT_COPY_FILES += $(shell test -d vendor/motorola/jordan/lib/modules && \
find vendor/motorola/jordan/lib/modules -name '*.ko' \
Expand All @@ -150,24 +133,6 @@ PRODUCT_COPY_FILES += \
$(call inherit-product, device/motorola/jordan/jordan-blobs.mk)
$(call inherit-product, device/motorola/jordan/bootmenu/bootmenu.mk)

# Live wallpaper packages
PRODUCT_PACKAGES += \
LiveWallpapers \
LiveWallpapersPicker \
MagicSmokeWallpapers \
VisualizationWallpapers

# Publish that we support the live wallpaper feature.
PRODUCT_COPY_FILES += \
packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:/system/etc/permissions/android.software.live_wallpaper.xml

# ICS USB Packages
PRODUCT_PACKAGES += com.android.future.usb.accessory

PRODUCT_COPY_FILES += \
frameworks/base/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \
frameworks/base/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \

######################################################################################################################################

$(call inherit-product, build/target/product/full_base.mk)
Expand All @@ -176,5 +141,5 @@ $(call inherit-product, build/target/product/full_base.mk)
PRODUCT_LOCALES += hdpi

PRODUCT_NAME := full_jordan
PRODUCT_DEVICE := MB526
PRODUCT_DEVICE := MB525

0 comments on commit 54dca36

Please sign in to comment.