diff -Nru a/bionic/linker/linker.c b/bionic/linker/linker.c --- a/bionic/linker/linker.c 2012-07-15 20:26:43.516598603 +0900 +++ b/bionic/linker/linker.c 2012-07-12 02:42:19.893305895 +0900 @@ -108,6 +108,10 @@ static soinfo *preloads[LDPRELOAD_MAX + 1]; +static const char ldpostload_names[] = "libbinder.deckard.so"; + +static soinfo *postloads = NULL; + #if LINKER_DEBUG int debug_verbosity; #endif @@ -470,6 +474,13 @@ } } + if(postloads != NULL) { + lsi = postloads; + s = _elf_lookup(lsi, elf_hash, name); + if(s != NULL) + goto done; + } + #if ALLOW_SYMBOLS_FROM_MAIN /* If we are resolving relocations while dlopen()ing a library, it's OK for * the library to resolve a symbol that's defined in the executable itself, @@ -1881,6 +1892,18 @@ } } + if(si->flags & FLAG_EXE) { + soinfo *lsi = find_library(ldpostload_names); + if(lsi == 0) { + strlcpy(tmp_err_buf, linker_get_error(), sizeof(tmp_err_buf)); + DL_ERR("%5d could not load needed library '%s' for '%s' (%s)", + pid, ldpostload_names, si->name, tmp_err_buf); + goto fail; + } + lsi->refcount++; + postloads = lsi; + } + for(d = si->dynamic; *d; d += 2) { if(d[0] == DT_NEEDED){ DEBUG("%5d %s needs %s\n", pid, si->name, si->strtab + d[1]); diff -Nru a/build/core/main.mk b/build/core/main.mk --- a/build/core/main.mk 2012-07-15 20:26:44.044862582 +0900 +++ b/build/core/main.mk 2012-07-12 02:42:19.885305896 +0900 @@ -243,7 +243,7 @@ enable_target_debugging := true ifneq (,$(user_variant)) # Target is secure in user builds. - ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=1 + ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=0 tags_to_install := user ifeq ($(user_variant),userdebug) diff -Nru a/development/tools/emulator/system/gps/Android.mk b/development/tools/emulator/system/gps/Android.mk --- a/development/tools/emulator/system/gps/Android.mk 2012-07-15 20:26:47.038358456 +0900 +++ b/development/tools/emulator/system/gps/Android.mk 2012-07-14 07:25:33.053360547 +0900 @@ -28,12 +28,13 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw LOCAL_CFLAGS += -DQEMU_HARDWARE -LOCAL_SHARED_LIBRARIES := liblog libcutils libhardware +LOCAL_PREBUILT_LIBS := libloc_api.so +LOCAL_SHARED_LIBRARIES := liblog libcutils libhardware libloc_api LOCAL_SRC_FILES := gps_qemu.c ifeq ($(TARGET_PRODUCT),vbox_x86) LOCAL_MODULE := gps.vbox_x86 else -LOCAL_MODULE := gps.goldfish +LOCAL_MODULE := gps.deckard endif LOCAL_MODULE_TAGS := debug include $(BUILD_SHARED_LIBRARY) diff -Nru a/development/tools/emulator/system/gps/gps_qemu.c b/development/tools/emulator/system/gps/gps_qemu.c --- a/development/tools/emulator/system/gps/gps_qemu.c 2012-07-15 20:26:47.042360456 +0900 +++ b/development/tools/emulator/system/gps/gps_qemu.c 2012-07-12 02:42:19.897305895 +0900 @@ -229,7 +229,7 @@ r->utc_mon = -1; r->utc_day = -1; r->callback = NULL; - r->fix.size = sizeof(r->fix); +// r->fix.size = sizeof(r->fix); nmea_reader_update_utc_diff( r ); } @@ -562,15 +562,21 @@ enum { CMD_QUIT = 0, CMD_START = 1, - CMD_STOP = 2 + CMD_STOP = 2, + CMD_LOCATION = 3, + CMD_STATUS = 4, + CMD_SV_STATUS = 5, + CMD_XTRA_DOWNLOAD = 6, + CMD_AGPS_STATUS = 7 }; /* this is the state of our connection to the qemu_gpsd daemon */ typedef struct { int init; - int fd; GpsCallbacks callbacks; + GpsXtraCallbacks xtra_callbacks; + AGpsCallbacks agps_callbacks; pthread_t thread; int control[2]; } GpsState; @@ -578,6 +584,101 @@ static GpsState _gps_state[1]; +static GpsLocation sGpsLocation; +static GpsStatus sGpsStatus; +static GpsSvStatus sGpsSvStatus; +static AGpsStatus sAGpsStatus; + + +static void +gps_state_location( GpsLocation* location ) +{ + GpsState* s = _gps_state; + char cmd = CMD_LOCATION; + int ret; + + memcpy(&sGpsLocation, location, sizeof(sGpsLocation)); + + do { ret=write( s->control[0], &cmd, 1 ); } + while (ret < 0 && errno == EINTR); + + if (ret != 1) + D("%s: could not send CMD_LOCATION command: ret=%d: %s", + __FUNCTION__, ret, strerror(errno)); +} + + +static void +gps_state_status( GpsStatus* status ) +{ + GpsState* s = _gps_state; + char cmd = CMD_STATUS; + int ret; + + memcpy(&sGpsStatus, status, sizeof(sGpsStatus)); + + do { ret=write( s->control[0], &cmd, 1 ); } + while (ret < 0 && errno == EINTR); + + if (ret != 1) + D("%s: could not send CMD_STATUS command: ret=%d: %s", + __FUNCTION__, ret, strerror(errno)); +} + + +static void +gps_state_sv_status( GpsSvStatus* sv_info ) +{ + GpsState* s = _gps_state; + char cmd = CMD_SV_STATUS; + int ret; + + memcpy(&sGpsSvStatus, sv_info, sizeof(sGpsSvStatus)); + + do { ret=write( s->control[0], &cmd, 1 ); } + while (ret < 0 && errno == EINTR); + + if (ret != 1) + D("%s: could not send CMD_SV_STATUS command: ret=%d: %s", + __FUNCTION__, ret, strerror(errno)); +} + + +static void +gps_state_xtra_download_request( ) +{ + GpsState* s = _gps_state; + char cmd = CMD_XTRA_DOWNLOAD; + int ret; + + do { ret=write( s->control[0], &cmd, 1 ); } + while (ret < 0 && errno == EINTR); + + if (ret != 1) + D("%s: could not send CMD_XTRA_DOWNLOAD command: ret=%d: %s", + __FUNCTION__, ret, strerror(errno)); +} + + +static void +gps_state_agps_status( AGpsStatus* status ) +{ + GpsState* s = _gps_state; + char cmd = CMD_AGPS_STATUS; + int ret; + + memcpy(&sAGpsStatus, status, sizeof(sAGpsStatus)); + sAGpsStatus.size = 0; + + do { ret=write( s->control[0], &cmd, 1 ); } + while (ret < 0 && errno == EINTR); + + if (ret != 1) + D("%s: could not send CMD_AGPS_STATUS command: ret=%d: %s", + __FUNCTION__, ret, strerror(errno)); +} + + static void gps_state_done( GpsState* s ) { @@ -591,8 +692,6 @@ close( s->control[0] ); s->control[0] = -1; close( s->control[1] ); s->control[1] = -1; - // close connection to the QEMU GPS daemon - close( s->fd ); s->fd = -1; s->init = 0; } @@ -667,14 +766,10 @@ NmeaReader reader[1]; int epoll_fd = epoll_create(2); int started = 0; - int gps_fd = state->fd; int control_fd = state->control[1]; - nmea_reader_init( reader ); - // register control file descriptors for polling epoll_register( epoll_fd, control_fd ); - epoll_register( epoll_fd, gps_fd ); D("gps thread running"); @@ -713,39 +808,36 @@ } else if (cmd == CMD_START) { if (!started) { - D("gps thread starting location_cb=%p", state->callbacks.location_cb); + D("gps thread starting"); started = 1; - nmea_reader_set_callback( reader, state->callbacks.location_cb ); } } else if (cmd == CMD_STOP) { if (started) { D("gps thread stopping"); started = 0; - nmea_reader_set_callback( reader, NULL ); } } - } - else if (fd == gps_fd) - { - char buff[32]; - D("gps fd event"); - for (;;) { - int nn, ret; - - ret = read( fd, buff, sizeof(buff) ); - if (ret < 0) { - if (errno == EINTR) - continue; - if (errno != EWOULDBLOCK) - ALOGE("error while reading from gps daemon socket: %s:", strerror(errno)); - break; - } - D("received %d bytes: %.*s", ret, ret, buff); - for (nn = 0; nn < ret; nn++) - nmea_reader_addc( reader, buff[nn] ); + else if (cmd == CMD_LOCATION) { + if (state->callbacks.location_cb) + state->callbacks.location_cb(&sGpsLocation); + } + else if (cmd == CMD_STATUS) { + if (state->callbacks.status_cb) + state->callbacks.status_cb(&sGpsStatus); + } + else if (cmd == CMD_SV_STATUS) { + if (state->callbacks.sv_status_cb) + state->callbacks.sv_status_cb(&sGpsSvStatus); + } + else if (cmd == CMD_XTRA_DOWNLOAD) { + if (state->xtra_callbacks.download_request_cb) + state->xtra_callbacks.download_request_cb(); + } + else if (cmd == CMD_AGPS_STATUS) { + if (state->agps_callbacks.status_cb) + state->agps_callbacks.status_cb(&sAGpsStatus); } - D("gps fd event end"); } else { @@ -763,16 +855,6 @@ state->init = 1; state->control[0] = -1; state->control[1] = -1; - state->fd = -1; - - state->fd = qemud_channel_open(QEMU_CHANNEL_NAME); - - if (state->fd < 0) { - D("no gps emulation detected"); - return; - } - - D("gps emulation will read from '%s' qemud channel", QEMU_CHANNEL_NAME ); if ( socketpair( AF_LOCAL, SOCK_STREAM, 0, state->control ) < 0 ) { ALOGE("could not create thread control socket pair: %s", strerror(errno)); @@ -804,6 +886,110 @@ /*****************************************************************/ /*****************************************************************/ +static const GpsInterface* sGpsInterface = NULL; +static const GpsXtraInterface* sGpsXtraInterface = NULL; +static const AGpsInterface* sAGpsInterface = NULL; + + +GpsXtraCallbacks sGpsXtraCallbacks = { + gps_state_xtra_download_request, + NULL, +}; + +static int +qemu_gps_xtra_init(GpsXtraCallbacks* callbacks) +{ + GpsState* s = _gps_state; + + s->xtra_callbacks = *callbacks; + + if (sGpsXtraInterface) + return sGpsXtraInterface->init(&sGpsXtraCallbacks); + return 0; +} + +static int +qemu_gps_xtra_inject_data(char* data, int length) +{ + if (sGpsXtraInterface) + return sGpsXtraInterface->inject_xtra_data(data, length); + return 0; +} + +static const GpsXtraInterface qemuGpsXtraInterface = { + qemu_gps_xtra_init, + qemu_gps_xtra_inject_data, +}; + + +AGpsCallbacks sAGpsCallbacks = { + gps_state_agps_status, + NULL, +}; + +static void +qemu_agps_init(AGpsCallbacks* callbacks) +{ + GpsState* s = _gps_state; + + s->agps_callbacks = *callbacks; + + if (sAGpsInterface) + sAGpsInterface->init(&sAGpsCallbacks); +} + +static int +qemu_agps_data_conn_open(const char* apn) +{ + if (sAGpsInterface) + return sAGpsInterface->data_conn_open(apn); + return 0; +} + +static int +qemu_agps_data_conn_closed() +{ + if (sAGpsInterface) + return sAGpsInterface->data_conn_closed(); + return 0; +} + +static int +qemu_agps_data_conn_failed() +{ + if (sAGpsInterface) + return sAGpsInterface->data_conn_failed(); + return 0; +} + +static int +qemu_agps_set_server(AGpsType type, const char* hostname, int port) +{ + if (sAGpsInterface) + return sAGpsInterface->set_server(type, hostname, port); + return 0; +} + +static const AGpsInterface qemuAGpsInterface = { + qemu_agps_init, + qemu_agps_data_conn_open, + qemu_agps_data_conn_closed, + qemu_agps_data_conn_failed, + qemu_agps_set_server, +}; + + +GpsCallbacks sGpsCallbacks = { + gps_state_location, + gps_state_status, + gps_state_sv_status, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, +}; static int qemu_gps_init(GpsCallbacks* callbacks) @@ -813,9 +999,8 @@ if (!s->init) gps_state_init(s, callbacks); - if (s->fd < 0) - return -1; - + if (sGpsInterface) + return sGpsInterface->init(&sGpsCallbacks); return 0; } @@ -826,6 +1011,9 @@ if (s->init) gps_state_done(s); + + if (sGpsInterface) + sGpsInterface->cleanup(); } @@ -841,6 +1029,9 @@ D("%s: called", __FUNCTION__); gps_state_start(s); + + if (sGpsInterface) + return sGpsInterface->start(); return 0; } @@ -857,6 +1048,9 @@ D("%s: called", __FUNCTION__); gps_state_stop(s); + + if (sGpsInterface) + return sGpsInterface->stop(); return 0; } @@ -864,35 +1058,52 @@ static int qemu_gps_inject_time(GpsUtcTime time, int64_t timeReference, int uncertainty) { + if (sGpsInterface) + return sGpsInterface->inject_time(time, timeReference, uncertainty); return 0; } static int qemu_gps_inject_location(double latitude, double longitude, float accuracy) { + if (sGpsInterface) + return sGpsInterface->inject_location(latitude, longitude, accuracy); return 0; } static void qemu_gps_delete_aiding_data(GpsAidingData flags) { + if (sGpsInterface) + sGpsInterface->delete_aiding_data(flags); } -static int qemu_gps_set_position_mode(GpsPositionMode mode, int fix_frequency) +typedef int (*gps_set_position_mode)(GpsPositionMode mode, int fix_frequency); + +static int qemu_gps_set_position_mode(GpsPositionMode mode, GpsPositionRecurrence recurrence, + uint32_t min_interval, uint32_t preferred_accuracy, uint32_t preferred_time) { - // FIXME - support fix_frequency + if (sGpsInterface) + return ((gps_set_position_mode)sGpsInterface->set_position_mode)(mode, (int)(min_interval/1000)); return 0; } static const void* qemu_gps_get_extension(const char* name) { - // no extensions supported + if (sGpsInterface) { + if (!strcmp(name, GPS_XTRA_INTERFACE)) { + sGpsXtraInterface = (GpsXtraInterface*)sGpsInterface->get_extension(name); + return (const void*)&qemuGpsXtraInterface; + } else if (!strcmp(name, AGPS_INTERFACE)) { + sAGpsInterface = (AGpsInterface*)sGpsInterface->get_extension(name); + return (const void*)&qemuAGpsInterface; + } + } return NULL; } static const GpsInterface qemuGpsInterface = { - sizeof(GpsInterface), qemu_gps_init, qemu_gps_start, qemu_gps_stop, @@ -904,8 +1115,11 @@ qemu_gps_get_extension, }; +const GpsInterface* gps_get_hardware_interface(); + const GpsInterface* gps__get_gps_interface(struct gps_device_t* dev) { + sGpsInterface = gps_get_hardware_interface(); return &qemuGpsInterface; } @@ -935,7 +1149,7 @@ .version_major = 1, .version_minor = 0, .id = GPS_HARDWARE_MODULE_ID, - .name = "Goldfish GPS Module", + .name = "Deckard GPS Module", .author = "The Android Open Source Project", .methods = &gps_module_methods, }; diff -Nru a/device/sharp/deckard/Android.mk b/device/sharp/deckard/Android.mk --- a/device/sharp/deckard/Android.mk 1970-01-01 09:00:00.000000000 +0900 +++ b/device/sharp/deckard/Android.mk 2012-07-12 02:42:19.881305896 +0900 @@ -0,0 +1,28 @@ +# +# Copyright (C) 2011 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. +# + +# WARNING: Everything listed here will be built on ALL platforms, +# including x86, the emulator, and the SDK. Modules must be uniquely +# named (liblights.deckard), and must build everywhere, or limit themselves +# to only building on ARM if they include assembly. Individual makefiles +# are responsible for having their own logic, for fine-grained control. + +LOCAL_PATH := $(call my-dir) + +# if some modules are built directly from this directory (not subdirectories), +# their rules should be written here. + +include $(call all-makefiles-under,$(LOCAL_PATH)) diff -Nru a/device/sharp/deckard/AndroidProducts.mk b/device/sharp/deckard/AndroidProducts.mk --- a/device/sharp/deckard/AndroidProducts.mk 1970-01-01 09:00:00.000000000 +0900 +++ b/device/sharp/deckard/AndroidProducts.mk 2012-07-12 02:42:19.881305896 +0900 @@ -0,0 +1,17 @@ +# +# Copyright (C) 2011 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. +# + +PRODUCT_MAKEFILES := $(LOCAL_DIR)/full_deckard.mk diff -Nru a/device/sharp/deckard/BoardConfig.mk b/device/sharp/deckard/BoardConfig.mk --- a/device/sharp/deckard/BoardConfig.mk 1970-01-01 09:00:00.000000000 +0900 +++ b/device/sharp/deckard/BoardConfig.mk 2012-07-12 02:42:19.881305896 +0900 @@ -0,0 +1,79 @@ +# +# Copyright (C) 2011 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 variable is set first, so it can be overridden +# by BoardConfigVendor.mk +USE_CAMERA_STUB := true + +# Use the non-open-source parts, if they're present +-include vendor/sharp/deckard/BoardConfigVendor.mk + +TARGET_CPU_ABI := armeabi-v7a +TARGET_CPU_ABI2 := armeabi +TARGET_CPU_SMP := false +TARGET_ARCH_VARIANT := armv7-a-neon +ARCH_ARM_HAVE_TLS_REGISTER := true + +BOARD_HAVE_BLUETOOTH := true +BOARD_HAVE_BLUETOOTH_BCM := false +TARGET_NO_BOOTLOADER := true +TARGET_NO_RECOVERY := true +TARGET_NO_KERNEL := true + +BOARD_KERNEL_BASE := 0x20000000 +#BOARD_KERNEL_CMDLINE := + +TARGET_NO_RADIOIMAGE := true +TARGET_BOARD_PLATFORM := qsd8k +TARGET_BOOTLOADER_BOARD_NAME := deckard + +#BOARD_USES_HGL := true +#BOARD_USES_OVERLAY := true +USE_OPENGL_RENDERER := true + +#TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888" +#TARGET_RECOVERY_UI_LIB := librecovery_ui_deckard + +# device-specific extensions to the updater binary +#TARGET_RECOVERY_UPDATER_LIBS += librecovery_updater_deckard +#TARGET_RELEASETOOLS_EXTENSIONS := device/sharp/deckard + +TARGET_USERIMAGES_USE_EXT4 := true +BOARD_SYSTEMIMAGE_PARTITION_SIZE := 268435456 +BOARD_USERDATAIMAGE_PARTITION_SIZE := 536870912 +BOARD_FLASH_BLOCK_SIZE := 4096 + +#TARGET_PROVIDES_INIT_RC := true +#TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true + +# Wifi related defines +BOARD_WPA_SUPPLICANT_DRIVER := WEXT +WPA_SUPPLICANT_VERSION := VER_0_5_X +#BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_bcmdhd +#BOARD_HOSTAPD_DRIVER := NL80211 +#BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_bcmdhd +#BOARD_WLAN_DEVICE := sdio +#WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/bcmdhd/parameters/firmware_path" +WIFI_DRIVER_MODULE_PATH := "/system/lib/modules/unifi_sdio.ko" +#WIFI_DRIVER_FW_PATH_STA := "/vendor/firmware/fw_bcmdhd.bin" +#WIFI_DRIVER_FW_PATH_P2P := "/vendor/firmware/fw_bcmdhd_p2p.bin" +#WIFI_DRIVER_FW_PATH_AP := "/vendor/firmware/fw_bcmdhd_apsta.bin" +WIFI_DRIVER_FW_STA_PATH := "/system/etc/firmware/unifi-sdio-1/a05/sta.xbv" +WIFI_DRIVER_MODULE_NAME := "unifi_sdio" + +#BOARD_LIB_DUMPSTATE := libdumpstate.deckard + +#BOARD_USES_SECURE_SERVICES := true diff -Nru a/device/sharp/deckard/SH_qwerty_key.idc b/device/sharp/deckard/SH_qwerty_key.idc --- a/device/sharp/deckard/SH_qwerty_key.idc 1970-01-01 09:00:00.000000000 +0900 +++ b/device/sharp/deckard/SH_qwerty_key.idc 2012-07-12 02:42:19.881305896 +0900 @@ -0,0 +1,23 @@ +# Copyright (C) 2011 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. + +# +# Input Device Calibration File for the Tuna touch screen. +# + +# Basic Parameters +cursor.mode = navigation +cursor.orientationAware = 1 +keyboard.orientationAware = 1 + diff -Nru a/device/sharp/deckard/SH_touchpanel.idc b/device/sharp/deckard/SH_touchpanel.idc --- a/device/sharp/deckard/SH_touchpanel.idc 1970-01-01 09:00:00.000000000 +0900 +++ b/device/sharp/deckard/SH_touchpanel.idc 2012-07-12 02:42:19.881305896 +0900 @@ -0,0 +1,21 @@ +# Copyright (C) 2011 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. + +# +# Input Device Calibration File for the Tuna touch screen. +# + +# Basic Parameters +touch.deviceType = touchScreen + diff -Nru a/device/sharp/deckard/device.mk b/device/sharp/deckard/device.mk --- a/device/sharp/deckard/device.mk 1970-01-01 09:00:00.000000000 +0900 +++ b/device/sharp/deckard/device.mk 2012-07-15 17:10:43.217468712 +0900 @@ -0,0 +1,99 @@ +# +# Copyright (C) 2011 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. +# + +ifeq ($(TARGET_PREBUILT_KERNEL),) +LOCAL_KERNEL := device/sharp/deckard/kernel +else +LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL) +endif + +PRODUCT_COPY_FILES := \ + $(LOCAL_KERNEL):kernel \ + device/sharp/deckard/ubi.cfg:ubi.cfg \ + device/sharp/deckard/vold.fstab:system/etc/vold.fstab + +# Compcache +PRODUCT_COPY_FILES += \ + device/sharp/deckard/unifi_sdio.ko:system/lib/modules/unifi_sdio.ko + +# Key maps +PRODUCT_COPY_FILES += \ + frameworks/base/data/keyboards/qwerty.kl:system/usr/keylayout/SH_qwerty_key.kl \ + frameworks/base/data/keyboards/qwerty2.kcm:system/usr/keychars/SH_qwerty_key.kcm \ + frameworks/base/data/keyboards/qwerty.kl:system/usr/keylayout/SH_pm_key.kl \ + frameworks/base/data/keyboards/qwerty.kcm:system/usr/keychars/SH_pm_key.kcm + +# Input device calibration files +PRODUCT_COPY_FILES += \ + device/sharp/deckard/SH_touchpanel.idc:system/usr/idc/SH_touchpanel.idc \ + device/sharp/deckard/SH_qwerty_key.idc:system/usr/idc/SH_qwerty_key.idc + +# These are the hardware-specific features +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \ + frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \ + frameworks/native/data/etc/android.hardware.touchscreen.multitouch.distinct.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.distinct.xml + +# adreno GPU drivers +PRODUCT_COPY_FILES += \ + device/sharp/deckard/adreno/system/etc/firmware/yamato_pfp.fw:system/etc/firmware/yamato_pfp.fw \ + device/sharp/deckard/adreno/system/etc/firmware/yamato_pm4.fw:system/etc/firmware/yamato_pm4.fw \ + device/sharp/deckard/adreno/system/lib/egl/egl.cfg:system/lib/egl/egl.cfg \ + device/sharp/deckard/adreno/system/lib/egl/eglsubAndroid.so:system/lib/egl/eglsubAndroid.so \ + device/sharp/deckard/adreno/system/lib/egl/libEGL_adreno200.so:system/lib/egl/libEGL_adreno200.so \ + device/sharp/deckard/adreno/system/lib/egl/libGLES_android.so:system/lib/egl/libGLES_android.so \ + device/sharp/deckard/adreno/system/lib/egl/libGLESv1_CM_adreno200.so:system/lib/egl/libGLESv1_CM_adreno200.so \ + device/sharp/deckard/adreno/system/lib/egl/libGLESv2_adreno200.so:system/lib/egl/libGLESv2_adreno200.so \ + device/sharp/deckard/adreno/system/lib/egl/libq3dtools_adreno200.so:system/lib/egl/libq3dtools_adreno200.so \ + device/sharp/deckard/adreno/system/lib/libC2D2.so:system/lib/libC2D2.so \ + device/sharp/deckard/adreno/system/lib/libgsl.so:system/lib/libgsl.so \ + device/sharp/deckard/adreno/system/lib/libOpenVG.so:system/lib/libOpenVG.so \ + device/sharp/deckard/adreno/system/lib/libsc-a2xx.so:system/lib/libsc-a2xx.so \ + device/sharp/deckard/ics_system/lib/hw/copybit.qsd8k.so:system/lib/hw/copybit.qsd8k.so \ + device/sharp/deckard/ics_system/lib/hw/gralloc.qsd8k.so:system/lib/hw/gralloc.qsd8k.so \ + device/sharp/deckard/ics_system/lib/hw/hwcomposer.qsd8k.so:system/lib/hw/hwcomposer.qsd8k.so \ + device/sharp/deckard/ics_system/lib/libgenlock.so:system/lib/libgenlock.so \ + device/sharp/deckard/ics_system/lib/libmemalloc.so:system/lib/libmemalloc.so \ + device/sharp/deckard/ics_system/lib/liboverlay.so:system/lib/liboverlay.so \ + device/sharp/deckard/ics_system/lib/libQcomUI.so:system/lib/libQcomUI.so \ + device/sharp/deckard/ics_system/lib/libtilerenderer.so:system/lib/libtilerenderer.so + +# Prebuilt libraries that are needed to build open-source libraries +PRODUCT_COPY_FILES += \ + device/sharp/deckard/libaudio.so:obj/lib/libaudio.so \ + device/sharp/deckard/libloc_api.so:obj/lib/libloc_api.so + +PRODUCT_PACKAGES += \ + audio.primary.deckard \ + libbinder.deckard + +PRODUCT_PROPERTY_OVERRIDES := \ + wifi.interface=wlan0 \ + wifi.supplicant_scan_interval=15 + +PRODUCT_PROPERTY_OVERRIDES += \ + hwui.render_dirty_regions=false \ + hwui.disable_vsync=true + +PRODUCT_PROPERTY_OVERRIDES += \ + ro.opengles.version=131072 + +PRODUCT_PROPERTY_OVERRIDES += \ + ro.sf.lcd_density=160 + +PRODUCT_CHARACTERISTICS := tablet + +$(call inherit-product, frameworks/native/build/phone-hdpi-dalvik-heap.mk) diff -Nru a/device/sharp/deckard/full_deckard.mk b/device/sharp/deckard/full_deckard.mk --- a/device/sharp/deckard/full_deckard.mk 1970-01-01 09:00:00.000000000 +0900 +++ b/device/sharp/deckard/full_deckard.mk 2012-07-12 02:42:19.881305896 +0900 @@ -0,0 +1,31 @@ +# Copyright (C) 2011 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 build configuration for a full Android +# build for deckard hardware. This cleanly combines a set of +# device-specific aspects (drivers) with a device-agnostic +# product configuration (apps). Except for a few implementation +# details, it only fundamentally contains two inherit-product +# lines, full and deckard, hence its name. +# + +# Inherit from those products. Most specific first. +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) +$(call inherit-product, device/sharp/deckard/device.mk) + +PRODUCT_NAME := full_deckard +PRODUCT_DEVICE := deckard +PRODUCT_BRAND := Android +PRODUCT_MODEL := Full AOSP on Deckard diff -Nru a/device/sharp/deckard/ubi.cfg b/device/sharp/deckard/ubi.cfg --- a/device/sharp/deckard/ubi.cfg 1970-01-01 09:00:00.000000000 +0900 +++ b/device/sharp/deckard/ubi.cfg 2012-07-12 02:42:19.881305896 +0900 @@ -0,0 +1,8 @@ +[boot] +mode=ubi +image=./boot.img +vol_id=0 +vol_size=200MiB +vol_type=dynamic +vol_name=boot +vol_flags=autoresize diff -Nru a/device/sharp/deckard/vendorsetup.sh b/device/sharp/deckard/vendorsetup.sh --- a/device/sharp/deckard/vendorsetup.sh 1970-01-01 09:00:00.000000000 +0900 +++ b/device/sharp/deckard/vendorsetup.sh 2012-07-12 02:42:19.885305896 +0900 @@ -0,0 +1,17 @@ +# +# Copyright (C) 2011 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. +# + +add_lunch_combo full_deckard-userdebug diff -Nru a/device/sharp/deckard/vold.fstab b/device/sharp/deckard/vold.fstab --- a/device/sharp/deckard/vold.fstab 1970-01-01 09:00:00.000000000 +0900 +++ b/device/sharp/deckard/vold.fstab 2012-07-12 02:42:19.885305896 +0900 @@ -0,0 +1,16 @@ +## Vold 2.0 Generic fstab +## - San Mehat (san@android.com) +## + +####################### +## Regular device mount +## +## Format: dev_mount