From 1f8d705fc9d61f5e2be9813bf4f4670cc10dd553 Mon Sep 17 00:00:00 2001 From: Shawn Alty Date: Thu, 24 Nov 2011 00:42:11 -0600 Subject: Move common stuff to aries-common. BoardConfig and recovery graphics. --- BoardConfig.mk | 83 +----------- recovery/graphics.c | 353 ---------------------------------------------------- 2 files changed, 2 insertions(+), 434 deletions(-) delete mode 100644 recovery/graphics.c diff --git a/BoardConfig.mk b/BoardConfig.mk index b0d8fd5..b33fdd0 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -17,94 +17,15 @@ # Product-specific compile-time definitions. # -# Set this up here so that BoardVendorConfig.mk can override it -BOARD_USES_GENERIC_AUDIO := false - -BOARD_USES_LIBSECRIL_STUB := true - -# Use the non-open-source parts, if they're present --include vendor/samsung/galaxysmtd/BoardConfigVendor.mk - -TARGET_CPU_ABI := armeabi-v7a -TARGET_CPU_ABI2 := armeabi -TARGET_ARCH_VARIANT := armv7-a-neon -ARCH_ARM_HAVE_TLS_REGISTER := true -TARGET_GLOBAL_CFLAGS += -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -TARGET_GLOBAL_CPPFLAGS += -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp - -TARGET_NO_BOOTLOADER := true -TARGET_NO_RADIOIMAGE := true - -TARGET_PROVIDES_INIT := true -TARGET_BOARD_PLATFORM := s5pv210 -TARGET_BOOTLOADER_BOARD_NAME := aries -TARGET_RECOVERY_INITRC := device/samsung/aries-common/recovery.rc - -BOARD_MOBILEDATA_INTERFACE_NAME = "pdp0" - -# Releasetools -TARGET_RELEASETOOL_OTA_FROM_TARGET_SCRIPT := ./device/samsung/aries-common/releasetools/aries_ota_from_target_files -TARGET_RELEASETOOL_IMG_FROM_TARGET_SCRIPT := ./device/samsung/aries-common/releasetools/aries_img_from_target_files - -# Camera -USE_CAMERA_STUB := false -ifeq ($(USE_CAMERA_STUB),false) -BOARD_CAMERA_LIBRARIES := libcamera -endif - -# Bluetooth -BOARD_HAVE_BLUETOOTH := true -BOARD_HAVE_BLUETOOTH_BCM := true - -# Video Devices -BOARD_USES_OVERLAY := true -BOARD_V4L2_DEVICE := /dev/video1 -BOARD_CAMERA_DEVICE := /dev/video0 -BOARD_SECOND_CAMERA_DEVICE := /dev/video2 +# Import the aries-common BoardConfigCommon.mk +include device/samsung/aries-common/BoardConfigCommon.mk # FM Radio BOARD_HAVE_FM_RADIO := true BOARD_GLOBAL_CFLAGS += -DHAVE_FM_RADIO BOARD_FM_DEVICE := si4709 -BOARD_NAND_PAGE_SIZE := 4096 -s 128 -BOARD_KERNEL_BASE := 0x32000000 -BOARD_KERNEL_PAGESIZE := 4096 -BOARD_KERNEL_CMDLINE := console=ttyFIQ0,115200 init=/init no_console_suspend -TARGET_PREBUILT_KERNEL := device/samsung/galaxysmtd/kernel - -BOARD_BOOTIMAGE_PARTITION_SIZE := 7864320 -BOARD_SYSTEMIMAGE_PARTITION_SIZE := 196608000 -BOARD_USERDATAIMAGE_PARTITION_SIZE := 2013265920 -BOARD_FLASH_BLOCK_SIZE := 4096 - -# Connectivity - Wi-Fi -BOARD_WPA_SUPPLICANT_DRIVER := WEXT -WPA_SUPPLICANT_VERSION := VER_0_8_X -BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_wext -BOARD_WLAN_DEVICE := bcm4329 -WIFI_DRIVER_MODULE_PATH := "/system/lib/modules/bcm4329.ko" -WIFI_DRIVER_FW_PATH_STA := "/vendor/firmware/fw_bcm4329.bin" -WIFI_DRIVER_FW_PATH_AP := "/vendor/firmware/fw_bcm4329_apsta.bin" -WIFI_DRIVER_MODULE_NAME := "bcm4329" -WIFI_DRIVER_MODULE_ARG := "firmware_path=/vendor/firmware/fw_bcm4329.bin nvram_path=/vendor/firmware/nvram_net.txt" - -# Vold -BOARD_VOLD_EMMC_SHARES_DEV_MAJOR := true - # Recovery -TARGET_USERIMAGES_USE_EXT4 := true BOARD_CUSTOM_RECOVERY_KEYMAPPING := ../../device/samsung/galaxysmtd/recovery/recovery_keys.c -BOARD_CUSTOM_GRAPHICS := ../../../device/samsung/galaxysmtd/recovery/graphics.c -BOARD_USES_BML_OVER_MTD := true -BOARD_CUSTOM_BOOTIMG_MK := device/samsung/aries-common/shbootimg.mk -TARGET_RECOVERY_PRE_COMMAND := "echo 1 > /cache/.startrecovery; sync;" -BOARD_HAS_NO_SELECT_BUTTON := true - -# Hardware rendering -USE_OPENGL_RENDERER := true - -# Include aries specific stuff --include device/samsung/aries-common/Android.mk TARGET_OTA_ASSERT_DEVICE := galaxys,galaxysmtd,GT-I9000,GT-I9000M,GT-I9000T diff --git a/recovery/graphics.c b/recovery/graphics.c deleted file mode 100644 index 87e4e29..0000000 --- a/recovery/graphics.c +++ /dev/null @@ -1,353 +0,0 @@ -/* - * Copyright (C) 2007 The Android Open Source 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. - */ - -#include -#include - -#include -#include - -#include -#include -#include - -#include -#include - -#include - -#ifndef BOARD_LDPI_RECOVERY - #include "font_10x18.h" -#else - #include "font_7x16.h" -#endif - -#include "minui.h" - -typedef struct { - GGLSurface texture; - unsigned cwidth; - unsigned cheight; - unsigned ascent; -} GRFont; - -static GRFont *gr_font = 0; -static GGLContext *gr_context = 0; -static GGLSurface gr_font_texture; -static GGLSurface gr_framebuffer[2]; -static GGLSurface gr_mem_surface; -static unsigned gr_active_fb = 0; - -static int gr_fb_fd = -1; -static int gr_vt_fd = -1; - -static struct fb_var_screeninfo vi; - -static int get_framebuffer(GGLSurface *fb) -{ - int fd; - struct fb_fix_screeninfo fi; - void *bits; - - fd = open("/dev/graphics/fb0", O_RDWR); - if (fd < 0) { - perror("cannot open fb0"); - return -1; - } - - if (ioctl(fd, FBIOGET_FSCREENINFO, &fi) < 0) { - perror("failed to get fb0 info"); - close(fd); - return -1; - } - - if (ioctl(fd, FBIOGET_VSCREENINFO, &vi) < 0) { - perror("failed to get fb0 info"); - close(fd); - return -1; - } - - bits = mmap(0, fi.smem_len, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); - if (bits == MAP_FAILED) { - perror("failed to mmap framebuffer"); - close(fd); - return -1; - } - - fb->version = sizeof(*fb); - fb->width = vi.xres; - fb->height = vi.yres; -#ifdef BOARD_HAS_JANKY_BACKBUFFER - fb->stride = fi.line_length/2; -#else - fb->stride = vi.xres; -#endif - fb->data = bits; - fb->format = GGL_PIXEL_FORMAT_RGB_565; - memset(fb->data, 0, vi.yres * vi.xres * 2); - - fb++; - - fb->version = sizeof(*fb); - fb->width = vi.xres; - fb->height = vi.yres; -#ifdef BOARD_HAS_JANKY_BACKBUFFER - fb->stride = fi.line_length/2; - fb->data = (void*) (((unsigned) bits) + vi.yres * fi.line_length); -#else - fb->stride = vi.xres; - fb->data = (void*) (((unsigned) bits) + vi.yres * vi.xres * 2); -#endif - fb->format = GGL_PIXEL_FORMAT_RGB_565; - memset(fb->data, 0, vi.yres * vi.xres * 2); - - return fd; -} - -static void get_memory_surface(GGLSurface* ms) { - ms->version = sizeof(*ms); - ms->width = vi.xres; - ms->height = vi.yres; - ms->stride = vi.xres; - ms->data = malloc(vi.xres * vi.yres * 2); - ms->format = GGL_PIXEL_FORMAT_RGB_565; -} - -static void set_active_framebuffer(unsigned n) -{ - if (n > 1) return; - vi.yres_virtual = vi.yres * 2; - vi.yoffset = n * vi.yres; - vi.bits_per_pixel = 16; - if (ioctl(gr_fb_fd, FBIOPUT_VSCREENINFO, &vi) < 0) { - perror("active fb swap failed"); - } -} - -void gr_flip(void) -{ - GGLContext *gl = gr_context; - - /* swap front and back buffers */ - gr_active_fb = (gr_active_fb + 1) & 1; - -#ifdef BOARD_HAS_FLIPPED_SCREEN - /* flip buffer 180 degrees for devices with physicaly inverted screens */ - unsigned int i; - for (i = 1; i < (vi.xres * vi.yres); i++) { - unsigned short tmp = gr_mem_surface.data[i]; - gr_mem_surface.data[i] = gr_mem_surface.data[(vi.xres * vi.yres * 2) - i]; - gr_mem_surface.data[(vi.xres * vi.yres * 2) - i] = tmp; - } -#endif - - /* copy data from the in-memory surface to the buffer we're about - * to make active. */ - memcpy(gr_framebuffer[gr_active_fb].data, gr_mem_surface.data, - vi.xres * vi.yres * 2); - - /* inform the display driver */ - set_active_framebuffer(gr_active_fb); -} - -void gr_color(unsigned char r, unsigned char g, unsigned char b, unsigned char a) -{ - GGLContext *gl = gr_context; - GGLint color[4]; - color[0] = ((r << 8) | r) + 1; - color[1] = ((g << 8) | g) + 1; - color[2] = ((b << 8) | b) + 1; - color[3] = ((a << 8) | a) + 1; - gl->color4xv(gl, color); -} - -int gr_measure(const char *s) -{ - return gr_font->cwidth * strlen(s); -} - -void gr_font_size(int *x, int *y) -{ - *x = gr_font->cwidth; - *y = gr_font->cheight; -} - -int gr_text(int x, int y, const char *s) -{ - GGLContext *gl = gr_context; - GRFont *font = gr_font; - unsigned off; - - y -= font->ascent; - - gl->bindTexture(gl, &font->texture); - gl->texEnvi(gl, GGL_TEXTURE_ENV, GGL_TEXTURE_ENV_MODE, GGL_REPLACE); - gl->texGeni(gl, GGL_S, GGL_TEXTURE_GEN_MODE, GGL_ONE_TO_ONE); - gl->texGeni(gl, GGL_T, GGL_TEXTURE_GEN_MODE, GGL_ONE_TO_ONE); - gl->enable(gl, GGL_TEXTURE_2D); - - while((off = *s++)) { - off -= 32; - if (off < 96) { - gl->texCoord2i(gl, (off * font->cwidth) - x, 0 - y); - gl->recti(gl, x, y, x + font->cwidth, y + font->cheight); - } - x += font->cwidth; - } - - return x; -} - -void gr_fill(int x, int y, int w, int h) -{ - GGLContext *gl = gr_context; - gl->disable(gl, GGL_TEXTURE_2D); - gl->recti(gl, x, y, w, h); -} - -void gr_blit(gr_surface source, int sx, int sy, int w, int h, int dx, int dy) { - if (gr_context == NULL) { - return; - } - GGLContext *gl = gr_context; - - gl->bindTexture(gl, (GGLSurface*) source); - gl->texEnvi(gl, GGL_TEXTURE_ENV, GGL_TEXTURE_ENV_MODE, GGL_REPLACE); - gl->texGeni(gl, GGL_S, GGL_TEXTURE_GEN_MODE, GGL_ONE_TO_ONE); - gl->texGeni(gl, GGL_T, GGL_TEXTURE_GEN_MODE, GGL_ONE_TO_ONE); - gl->enable(gl, GGL_TEXTURE_2D); - gl->texCoord2i(gl, sx - dx, sy - dy); - gl->recti(gl, dx, dy, dx + w, dy + h); -} - -unsigned int gr_get_width(gr_surface surface) { - if (surface == NULL) { - return 0; - } - return ((GGLSurface*) surface)->width; -} - -unsigned int gr_get_height(gr_surface surface) { - if (surface == NULL) { - return 0; - } - return ((GGLSurface*) surface)->height; -} - -static void gr_init_font(void) -{ - GGLSurface *ftex; - unsigned char *bits, *rle; - unsigned char *in, data; - - gr_font = calloc(sizeof(*gr_font), 1); - ftex = &gr_font->texture; - - bits = malloc(font.width * font.height); - - ftex->version = sizeof(*ftex); - ftex->width = font.width; - ftex->height = font.height; - ftex->stride = font.width; - ftex->data = (void*) bits; - ftex->format = GGL_PIXEL_FORMAT_A_8; - - in = font.rundata; - while((data = *in++)) { - memset(bits, (data & 0x80) ? 255 : 0, data & 0x7f); - bits += (data & 0x7f); - } - - gr_font->cwidth = font.cwidth; - gr_font->cheight = font.cheight; - gr_font->ascent = font.cheight - 2; -} - -int gr_init(void) -{ - gglInit(&gr_context); - GGLContext *gl = gr_context; - - gr_init_font(); - gr_vt_fd = open("/dev/tty0", O_RDWR | O_SYNC); - if (gr_vt_fd < 0) { - // This is non-fatal; post-Cupcake kernels don't have tty0. - perror("can't open /dev/tty0"); - } else if (ioctl(gr_vt_fd, KDSETMODE, (void*) KD_GRAPHICS)) { - // However, if we do open tty0, we expect the ioctl to work. - perror("failed KDSETMODE to KD_GRAPHICS on tty0"); - gr_exit(); - return -1; - } - - gr_fb_fd = get_framebuffer(gr_framebuffer); - if (gr_fb_fd < 0) { - gr_exit(); - return -1; - } - - get_memory_surface(&gr_mem_surface); - - fprintf(stderr, "framebuffer: fd %d (%d x %d)\n", - gr_fb_fd, gr_framebuffer[0].width, gr_framebuffer[0].height); - - /* start with 0 as front (displayed) and 1 as back (drawing) */ - gr_active_fb = 0; - set_active_framebuffer(0); - gl->colorBuffer(gl, &gr_mem_surface); - - gl->activeTexture(gl, 0); - gl->enable(gl, GGL_BLEND); - gl->blendFunc(gl, GGL_SRC_ALPHA, GGL_ONE_MINUS_SRC_ALPHA); - - return 0; -} - -void gr_exit(void) -{ - close(gr_fb_fd); - gr_fb_fd = -1; - - free(gr_mem_surface.data); - - ioctl(gr_vt_fd, KDSETMODE, (void*) KD_TEXT); - close(gr_vt_fd); - gr_vt_fd = -1; -} - -int gr_fb_width(void) -{ - return gr_framebuffer[0].width; -} - -int gr_fb_height(void) -{ - return gr_framebuffer[0].height; -} - -gr_pixel *gr_fb_data(void) -{ - return (unsigned short *) gr_mem_surface.data; -} - -void gr_fb_blank(bool blank) -{ - int ret; - - ret = ioctl(gr_fb_fd, FBIOBLANK, blank ? FB_BLANK_POWERDOWN : FB_BLANK_UNBLANK); - if (ret < 0) - perror("ioctl(): blank"); -} -- cgit v1.1 From 1935a5bd71c3b827bb855b573fc88b3818ed7198 Mon Sep 17 00:00:00 2001 From: Shawn Alty Date: Thu, 24 Nov 2011 01:11:54 -0600 Subject: Move some stuff around Rename galaxysmtd.mk to device.mk that inherits device_base.mk from aries-common. --- device.mk | 66 +++++++++++++++++++ full_galaxysmtd.mk | 2 +- galaxysmtd.mk | 188 ----------------------------------------------------- 3 files changed, 67 insertions(+), 189 deletions(-) create mode 100644 device.mk delete mode 100644 galaxysmtd.mk diff --git a/device.mk b/device.mk new file mode 100644 index 0000000..3ce91eb --- /dev/null +++ b/device.mk @@ -0,0 +1,66 @@ +# Copyright (C) 2010 The Android Open Source 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. + + +# This file is the device-specific product definition file for +# crespo. It lists all the overlays, files, modules and properties +# that are specific to this hardware: i.e. those are device-specific +# drivers, configuration files, settings, etc... + +# Note that crespo is not a fully open device. Some of the drivers +# aren't publicly available in all circumstances, which means that some +# of the hardware capabilities aren't present in builds where those +# drivers aren't available. Such cases are handled by having this file +# separated into two halves: this half here contains the parts that +# are available to everyone, while another half in the vendor/ hierarchy +# augments that set with the parts that are only relevant when all the +# associated drivers are available. Aspects that are irrelevant but +# harmless in no-driver builds should be kept here for simplicity and +# transparency. There are two variants of the half that deals with +# the unavailable drivers: one is directly checked into the unreleased +# vendor tree and is used by engineers who have access to it. The other +# is generated by setup-makefile.sh in the same directory as this files, +# and is used by people who have access to binary versions of the drivers +# but not to the original vendor tree. Be sure to update both. + +# These are the hardware-specific configuration files +PRODUCT_COPY_FILES := \ + device/samsung/galaxysmtd/asound.conf:system/etc/asound.conf + +# Prebuilt kl keymaps +PRODUCT_COPY_FILES += \ + device/samsung/galaxysmtd/aries-keypad.kl:system/usr/keylayout/aries-keypad.kl + +# kernel modules +PRODUCT_COPY_FILES += $(foreach module,\ + $(wildcard device/samsung/galaxysmtd/*.ko),\ + $(module):system/lib/modules/$(notdir $(module))) + +ifeq ($(TARGET_PREBUILT_KERNEL),) + LOCAL_KERNEL := device/samsung/galaxysmtd/kernel +else + LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL) +endif + +PRODUCT_COPY_FILES += \ + $(LOCAL_KERNEL):kernel + +# Inherit Aries common device configuration. +$(call inherit-product, device/samsung/aries-common/device_base.mk) + +# See comment at the top of this file. This is where the other +# half of the device-specific product definition file takes care +# of the aspects that require proprietary drivers that aren't +# commonly available +$(call inherit-product-if-exists, vendor/samsung/galaxysmtd/galaxysmtd-vendor.mk) diff --git a/full_galaxysmtd.mk b/full_galaxysmtd.mk index 694b898..fdde1da 100644 --- a/full_galaxysmtd.mk +++ b/full_galaxysmtd.mk @@ -23,7 +23,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk) # This is where we'd set a backup provider if we had one #$(call inherit-product, device/sample/products/backup_overlay.mk) -$(call inherit-product, device/samsung/galaxysmtd/galaxysmtd.mk) +$(call inherit-product, device/samsung/galaxysmtd/device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/full.mk) # Galaxy S uses high-density artwork where available diff --git a/galaxysmtd.mk b/galaxysmtd.mk deleted file mode 100644 index 22a0d8e..0000000 --- a/galaxysmtd.mk +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright (C) 2010 The Android Open Source 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. - - -# This file is the device-specific product definition file for -# crespo. It lists all the overlays, files, modules and properties -# that are specific to this hardware: i.e. those are device-specific -# drivers, configuration files, settings, etc... - -# Note that crespo is not a fully open device. Some of the drivers -# aren't publicly available in all circumstances, which means that some -# of the hardware capabilities aren't present in builds where those -# drivers aren't available. Such cases are handled by having this file -# separated into two halves: this half here contains the parts that -# are available to everyone, while another half in the vendor/ hierarchy -# augments that set with the parts that are only relevant when all the -# associated drivers are available. Aspects that are irrelevant but -# harmless in no-driver builds should be kept here for simplicity and -# transparency. There are two variants of the half that deals with -# the unavailable drivers: one is directly checked into the unreleased -# vendor tree and is used by engineers who have access to it. The other -# is generated by setup-makefile.sh in the same directory as this files, -# and is used by people who have access to binary versions of the drivers -# but not to the original vendor tree. Be sure to update both. - - -# These is the hardware-specific overlay, which points to the location -# of hardware-specific resource overrides, typically the frameworks and -# application settings that are stored in resourced. -DEVICE_PACKAGE_OVERLAYS := device/samsung/aries-common/overlay - -# These are the hardware-specific configuration files -PRODUCT_COPY_FILES := \ - device/samsung/galaxysmtd/asound.conf:system/etc/asound.conf \ - device/samsung/aries-common/vold.fstab:system/etc/vold.fstab \ - device/samsung/aries-common/egl.cfg:system/lib/egl/egl.cfg \ - device/samsung/aries-common/mxt224_ts_input.idc:system/usr/idc/mxt224_ts_input.idc - -# Init files -PRODUCT_COPY_FILES += \ - device/samsung/aries-common/init.aries.rc:root/init.aries.rc \ - device/samsung/aries-common/init.aries.usb.rc:root/init.aries.usb.rc \ - device/samsung/aries-common/lpm.rc:root/lpm.rc \ - device/samsung/aries-common/ueventd.aries.rc:root/ueventd.aries.rc \ - device/samsung/aries-common/setupenv.sh:recovery/root/sbin/setupenv.sh - - -# Prebuilt kl keymaps -PRODUCT_COPY_FILES += \ - device/samsung/aries-common/cypress-touchkey.kl:system/usr/keylayout/cypress-touchkey.kl \ - device/samsung/aries-common/sec_jack.kl:system/usr/keylayout/sec_jack.kl \ - device/samsung/galaxysmtd/aries-keypad.kl:system/usr/keylayout/aries-keypad.kl \ - device/samsung/aries-common/s3c-keypad.kl:system/usr/keylayout/s3c-keypad.kl - -# Generated kcm keymaps -PRODUCT_PACKAGES := \ - cypress-touchkey.kcm \ - s3c-keypad.kcm - -# Filesystem management tools -PRODUCT_PACKAGES += \ - make_ext4fs \ - setup_fs - -# These are the OpenMAX IL configuration files -PRODUCT_COPY_FILES += \ - device/samsung/aries-common/sec_mm/sec_omx/sec_omx_core/secomxregistry:system/etc/secomxregistry \ - device/samsung/aries-common/media_profiles.xml:system/etc/media_profiles.xml - -# These are the OpenMAX IL modules -PRODUCT_PACKAGES += \ - libSEC_OMX_Core.aries \ - libOMX.SEC.AVC.Decoder.aries \ - libOMX.SEC.M4V.Decoder.aries \ - libOMX.SEC.M4V.Encoder.aries \ - libOMX.SEC.AVC.Encoder.aries - -# Misc other modules -PRODUCT_PACKAGES += \ - lights.aries \ - sensors.aries \ - audio.primary.aries \ - audio_policy.aries - -# Libs -PRODUCT_PACKAGES += \ - libstagefrighthw - - -# apns config file -PRODUCT_COPY_FILES += \ - development/data/etc/apns-conf.xml:system/etc/apns-conf.xml - -# Bluetooth MAC Address -PRODUCT_PACKAGES += \ - bdaddr_read - -# Device-specific packages -PRODUCT_PACKAGES += \ - SamsungServiceMode \ - AriesParts - -# These are the hardware-specific features -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 \ - frameworks/base/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \ - frameworks/base/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml \ - frameworks/base/data/etc/android.hardware.location.xml:system/etc/permissions/android.hardware.location.xml \ - frameworks/base/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \ - frameworks/base/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \ - frameworks/base/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \ - frameworks/base/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \ - frameworks/base/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.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 - -# The OpenGL ES API level that is natively supported by this device. -# This is a 16.16 fixed point number -PRODUCT_PROPERTY_OVERRIDES := \ - ro.opengles.version=131072 - -# These are the hardware-specific settings that are stored in system properties. -# Note that the only such settings should be the ones that are too low-level to -# be reachable from resources or other mechanisms. -PRODUCT_PROPERTY_OVERRIDES += \ - wifi.interface=eth0 \ - wifi.supplicant_scan_interval=20 \ - ro.telephony.ril_class=samsung \ - ro.telephony.ril.v3=1 \ - mobiledata.interfaces=pdp0,eth0,gprs,ppp0 \ - dalvik.vm.heapsize=32m - -# enable Google-specific location features, -# like NetworkLocationProvider and LocationCollector -PRODUCT_PROPERTY_OVERRIDES += \ - ro.com.google.locationfeatures=1 \ - ro.com.google.networklocation=1 - -# Extended JNI checks -# The extended JNI checks will cause the system to run more slowly, but they can spot a variety of nasty bugs -# before they have a chance to cause problems. -# Default=true for development builds, set by android buildsystem. -PRODUCT_PROPERTY_OVERRIDES += \ - ro.kernel.android.checkjni=0 \ - dalvik.vm.checkjni=false \ - persist.sys.vold.switchexternal=1 - -# Set default USB interface -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ - persist.sys.usb.config=mtp - -# we have enough storage space to hold precise GC data -PRODUCT_TAGS += dalvik.gc.type-precise - -# kernel modules -PRODUCT_COPY_FILES += $(foreach module,\ - $(wildcard device/samsung/galaxysmtd/*.ko),\ - $(module):system/lib/modules/$(notdir $(module))) - -ifeq ($(TARGET_PREBUILT_KERNEL),) - LOCAL_KERNEL := device/samsung/galaxysmtd/kernel -else - LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL) -endif - -PRODUCT_COPY_FILES += \ - $(LOCAL_KERNEL):kernel - -PRODUCT_COPY_FILES += \ - device/samsung/aries-common/updater.sh:updater.sh - -# See comment at the top of this file. This is where the other -# half of the device-specific product definition file takes care -# of the aspects that require proprietary drivers that aren't -# commonly available -$(call inherit-product-if-exists, vendor/samsung/galaxysmtd/galaxysmtd-vendor.mk) -- cgit v1.1 From a96656f3a633bb96be107b5a64df83d927d02902 Mon Sep 17 00:00:00 2001 From: Shawn Alty Date: Thu, 24 Nov 2011 01:30:10 -0600 Subject: fix a derp --- BoardConfig.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index b33fdd0..0e15033 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -17,8 +17,11 @@ # Product-specific compile-time definitions. # -# Import the aries-common BoardConfigCommon.mk -include device/samsung/aries-common/BoardConfigCommon.mk +#Video Devices +BOARD_SECOND_CAMERA_DEVICE := /dev/video2 + +#Prebuilt Kernel +TARGET_PREBUILT_KERNEL := device/samsung/galaxysmtd/kernel # FM Radio BOARD_HAVE_FM_RADIO := true @@ -29,3 +32,6 @@ BOARD_FM_DEVICE := si4709 BOARD_CUSTOM_RECOVERY_KEYMAPPING := ../../device/samsung/galaxysmtd/recovery/recovery_keys.c TARGET_OTA_ASSERT_DEVICE := galaxys,galaxysmtd,GT-I9000,GT-I9000M,GT-I9000T + +# Import the aries-common BoardConfigCommon.mk +include device/samsung/aries-common/BoardConfigCommon.mk -- cgit v1.1