diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-11-02 17:43:31 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-11-06 20:11:55 +0000 |
| commit | 9af9b6902e74cb496e5bc5f2c0d900808e0ab6ab (patch) | |
| tree | 1fd6fece5b8df62655cd14648e4724e86398955a | |
| parent | 28cd3f3375476cbf437241bfc5efb223a73955b8 (diff) | |
| download | device_samsung_smdk4412-common-9af9b6902e74cb496e5bc5f2c0d900808e0ab6ab.zip device_samsung_smdk4412-common-9af9b6902e74cb496e5bc5f2c0d900808e0ab6ab.tar.gz device_samsung_smdk4412-common-9af9b6902e74cb496e5bc5f2c0d900808e0ab6ab.tar.bz2 | |
Updates for 11.0
Change-Id: Ie3388de4e91262b7b8cd5c6949b9575e282baf1b
| -rw-r--r-- | BoardCommonConfig.mk | 3 | ||||
| -rw-r--r-- | common.mk | 6 | ||||
| -rw-r--r-- | recovery/graphics.c | 2 | ||||
| -rwxr-xr-x | rootdir/init.smdk4x12.rc | 6 |
4 files changed, 8 insertions, 9 deletions
diff --git a/BoardCommonConfig.mk b/BoardCommonConfig.mk index 866dea8..520f8da 100644 --- a/BoardCommonConfig.mk +++ b/BoardCommonConfig.mk @@ -75,7 +75,8 @@ BOARD_HARDWARE_CLASS := hardware/samsung/cmhw BOARD_EGL_CFG := device/samsung/smdk4412-common/configs/egl.cfg USE_OPENGL_RENDERER := true BOARD_USES_SKIAHWJPEG := true -COMMON_GLOBAL_CFLAGS += -DSEC_HWJPEG_G2D -DFORCE_SCREENSHOT_CPU_PATH +COMMON_GLOBAL_CFLAGS += -DSEC_HWJPEG_G2D -DFORCE_SCREENSHOT_CPU_PATH -DWORKAROUND_BUG_10194508 +TARGET_RUNNING_WITHOUT_SYNC_FRAMEWORK := true # FIMG Acceleration BOARD_USES_FIMGAPI := true @@ -48,10 +48,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ $(COMMON_PATH)/configs/98netflix:system/etc/init.d/98netflix -# Bluetooth configuration files -PRODUCT_COPY_FILES += \ - system/bluetooth/data/main.le.conf:system/etc/bluetooth/main.conf - # Wifi PRODUCT_COPY_FILES += \ $(COMMON_PATH)/configs/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf @@ -152,7 +148,9 @@ PRODUCT_COPY_FILES += \ # Graphics PRODUCT_PROPERTY_OVERRIDES += \ + ro.zygote.disable_gl_preload=1 \ ro.opengles.version=131072 \ + ro.bq.gpu_to_cpu_unsupported=1 \ debug.hwui.render_dirty_regions=false PRODUCT_TAGS += dalvik.gc.type-precise diff --git a/recovery/graphics.c b/recovery/graphics.c index 6d60b27..addf578 100644 --- a/recovery/graphics.c +++ b/recovery/graphics.c @@ -205,7 +205,7 @@ void gr_font_size(int *x, int *y) *y = gr_font->cheight; } -int gr_text(int x, int y, const char *s) +int gr_text(int x, int y, const char *s, int bold) { GGLContext *gl = gr_context; GRFont *font = gr_font; diff --git a/rootdir/init.smdk4x12.rc b/rootdir/init.smdk4x12.rc index e4295f6..a197518 100755 --- a/rootdir/init.smdk4x12.rc +++ b/rootdir/init.smdk4x12.rc @@ -432,13 +432,13 @@ on property:ro.uart_debug=0 # create virtual SD card at /mnt/sdcard, based on the /data/media directory # daemon will drop to user/group system/media_rw after initializing # underlying files in /data/media wil be created with user and group media_rw (1023) -service sdcard /system/bin/sdcard /data/media /mnt/shell/emulated 1023 1023 +service sdcard /system/bin/sdcard -u 1023 -g 1023 -l /data/media /mnt/shell/emulated class late_start service p2p_supplicant /system/bin/wpa_supplicant \ -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf -N \ -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf -e/data/misc/wifi/entropy.bin \ - -puse_p2p_group_interface=1 + -puse_p2p_group_interface=1 -O/data/misc/wifi/sockets -g@android:wpa_wlan0 # we will start as root and wpa_supplicant will switch to user wifi # after setting up the capabilities required for WEXT # user wifi @@ -450,7 +450,7 @@ service p2p_supplicant /system/bin/wpa_supplicant \ service wpa_supplicant /system/bin/wpa_supplicant \ -Dnl80211 -iwlan0 -e/data/misc/wifi/entropy.bin \ - -c/data/misc/wifi/wpa_supplicant.conf + -c/data/misc/wifi/wpa_supplicant.conf -O/data/misc/wifi/sockets -g@android:wpa_wlan0 # we will start as root and wpa_supplicant will switch to user wifi # after setting up the capabilities required for WEXT # user wifi |