Switch to Nexus style data layout and allow apps, dalvik-cache and media from external sdcard

BoardConfig.mk

@@ -29,7 +29,6 @@ TARGET_SPECIFIC_HEADER_PATH := $(LOCAL_PATH)/include
 
 BOARD_VENDOR := htc
 
-
 # Bootloader
 TARGET_NO_BOOTLOADER := true
 
@@ -46,9 +45,11 @@ TARGET_CPU_VARIANT := scorpion
 ARCH_ARM_HAVE_TLS_REGISTER := true
 TARGET_NEEDS_NON_PIE_SUPPORT := true
 
+# Libc extensions
+BOARD_PROVIDES_ADDITIONAL_BIONIC_STATIC_LIBS += libc_htc_symbols
+
 # Flags
 COMMON_GLOBAL_CFLAGS += -DQCOM_HARDWARE
-COMMON_GLOBAL_CFLAGS += -DHTCLOG
 COMMON_GLOBAL_CFLAGS += -DQCOM_BSP
 
 # Fonts
@@ -60,6 +61,9 @@ BOARD_USES_QCOM_HARDWARE := true
 # Audio
 COMMON_GLOBAL_CFLAGS += -DHTC_ACOUSTIC_AUDIO -DLEGACY_QCOM_VOICE
 BOARD_USES_LEGACY_ALSA_AUDIO := true
+AUDIO_FEATURE_ENABLED_COMPRESS_VOIP := false
+AUDIO_FEATURE_ENABLED_PROXY_DEVICE := false
+AUDIO_FEATURE_ENABLED_INCALL_MUSIC := true
 
 # Camera
 BOARD_NEEDS_MEMORYHEAPPMEM := true
@@ -79,14 +83,14 @@ AUDIO_FEATURE_ENABLED_FM := true
 TARGET_GPS_HAL_PATH := $(LOCAL_PATH)/gps
 BOARD_VENDOR_QCOM_GPS_LOC_API_AMSS_VERSION := 50000
 
-
 # Graphics
 USE_OPENGL_RENDERER := true
 TARGET_DISPLAY_USE_RETIRE_FENCE := true
 TARGET_USES_C2D_COMPOSITION := true
 TARGET_USES_ION := true
 NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
 TARGET_DISPLAY_INSECURE_MM_HEAP := true
+DEVICE_RESOLUTION := 540x960
 
 # Media
 TARGET_NO_ADAPTIVE_PLAYBACK := true
@@ -112,11 +116,15 @@ BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x01400000
 TARGET_KERNEL_CONFIG := pyramid_defconfig
 TARGET_KERNEL_SOURCE := kernel/htc/pyramid
 
+# Recovery
+TARGET_RECOVERY_DEVICE_MODULES += chargeled
 TARGET_RECOVERY_FSTAB := device/htc/pyramid/rootdir/etc/fstab.pyramid
 RECOVERY_FSTAB_VERSION := 2
 TARGET_RECOVERY_PIXEL_FORMAT := "RGBX_8888"
 RECOVERY_GRAPHICS_USE_LINELENGTH := true
 TARGET_RECOVERY_DEVICE_DIRS += device/htc/pyramid
+RECOVERY_SDCARD_ON_DATA := true
+BOARD_HAS_NO_REAL_SDCARD := true
 
 # Required for Sensors
 COMMON_GLOBAL_CFLAGS += -DNEEDS_VECTORIMPL_SYMBOLS
@@ -141,16 +149,17 @@ BOARD_HARDWARE_CLASS := $(LOCAL_PATH)/cmhw
 # RIL
 BOARD_RIL_CLASS := ../../../$(LOCAL_PATH)/ril
 
+# USB
+TARGET_USE_CUSTOM_LUN_FILE_PATH := "/sys/devices/platform/msm_hsusb/gadget/lun0/file"
+
 # Misc
 BOARD_USES_LEGACY_MMAP := true
 BOARD_SUPPRESS_EMMC_WIPE := true
+BOARD_SUPPRESS_SECURE_ERASE := true
 
 # Use dlmalloc
 MALLOC_IMPL := dlmalloc
 
-# Recovery
-TARGET_RECOVERY_DEVICE_MODULES += chargeled
-
 # SELinux
 -include device/qcom/sepolicy/sepolicy.mk
 
@@ -169,11 +178,11 @@ TARGET_USERIMAGES_USE_F2FS := true
 BOARD_VOLD_MAX_PARTITIONS := 36
 BOARD_BOOTIMAGE_PARTITION_SIZE := 16777216
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 16776192
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 838859776
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1252770816
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 1252770816
 BOARD_FLASH_BLOCK_SIZE := 262144
 
-# Twrp
+# TWRP
 TW_THEME := portrait_mdpi
 TW_INCLUDE_CRYPTO := true
 TW_NO_SCREEN_BLANK := true
@@ -183,4 +192,10 @@ TW_NO_CPU_TEMP := true
 TW_NEW_ION_HEAP := true
 TW_INCLUDE_NTFS_3G := true
 TW_BRIGHTNESS_PATH := "/sys/class/leds/lcd-backlight/brightness"
-TARGET_USE_CUSTOM_LUN_FILE_PATH := "/sys/devices/platform/msm_hsusb/gadget/lun0/file"
+TW_BACKUP_DATA_MEDIA := false
+
+# Dalvik/ART
+WITH_DEXPREOPT := true
+WITH_DEXPREOPT_COMP := false
+WITH_DEXPREOPT_PIC := true
+WITH_ART_SMALL_MODE := true

device_pyramid.mk

@@ -48,7 +48,9 @@ PRODUCT_PACKAGES += \
     audio.a2dp.default \
     audio.r_submix.default \
     audio.usb.default \
+    audio_policy.msm8660 \
     audio.primary.msm8660 \
+    audio_policy.conf \
     libaudioutils \
     libdashplayer \
     libaudio-resampler
@@ -106,6 +108,11 @@ PRODUCT_PACKAGES += \
     make_ext4fs \
     setup_fs
 
+# IPv6 tethering
+PRODUCT_PACKAGES += \
+    ebtables \
+    ethertypes
+
 # Net
 PRODUCT_PACKAGES += \
     libnetcmdiface \
@@ -123,10 +130,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     bt_vendor.conf
 
-# Audio policy configuration
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/audio_policy.conf:system/etc/audio_policy.conf
-
 # Media configuration
 PRODUCT_COPY_FILES += \
     frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
@@ -223,6 +226,7 @@ $(call inherit-product, device/htc/pyramid/media_a1026.mk)
 ## htc audio settings
 $(call inherit-product, device/htc/pyramid/media_htcaudio.mk)
 
+# setup dalvik vm configs
 $(call inherit-product, frameworks/native/build/phone-hdpi-512-dalvik-heap.mk)
 
 # Discard inherited values and use our own instead.

libc_htc_symbols/Android.mk

@@ -0,0 +1,25 @@
+# Copyright (C) 2015 The CyanogenMod 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.
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+    htc_log.c
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
+LOCAL_MODULE := libc_htc_symbols
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_STATIC_LIBRARY)

libc_htc_symbols/htc_log.c

@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2015 The CyanogenMod 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.
+ */
+
+#ifndef __unused
+#define __unused  __attribute__((__unused__))
+#endif
+
+signed int __htclog_read_masks(char *buf __unused, signed int len __unused)
+{
+    return 0;
+}
+
+int __htclog_init_mask(const char *a1 __unused, unsigned int a2 __unused, int a3 __unused)
+{
+    return 0;
+}
+
+int __htclog_print_private(int a1 __unused, const char *a2 __unused, const char *fmt __unused, ...)
+{
+    return 0;
+}

overlay/frameworks/base/core/res/res/xml/storage_list.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 **
-** Copyright 2011, The Android Open Source Project
+** Copyright 2013, 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.
@@ -17,30 +17,17 @@
 */
 -->
 
-<!-- The <device> element should contain one or more <storage> elements.
-     Exactly one of these should have the attribute primary="true".
-     This storage will be the primary external storage and should have path="/mnt/sdcard".
-     Each storage should have both a path and description attribute set.
-     The following boolean attributes are optional:
-
-        primary:    this storage is the primary external storage
-        removable:  this is removable storage (for example, a real SD card)
-        emulated:   the storage is emulated via the FUSE sdcard daemon
-        mtp-reserve: number of megabytes of storage MTP should reserve for free storage
-                     (used for emulated storage that is shared with system's data partition)
-
-      A storage should not have both emulated and removable set to true
--->
+<!-- See storage config details at http://source.android.com/tech/storage/ -->
 
 <StorageList xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- removable is not set in nosdcard product -->
-    <storage android:mountPoint="/storage/sdcard0"
-             android:storageDescription="@string/storage_sd_card"
-             android:primary="true"
-             android:removable="true"
-             android:allowMassStorage="true"
-	     android:maxFileSize="4096" />
+    <!-- internal emulated storage -->
+    <storage
+        android:storageDescription="@string/storage_internal"
+        android:emulated="true"
+        android:primary="true"
+        android:mtpReserve="100" />
+    <!-- external USB OTG storage -->
     <storage android:mountPoint="/storage/usbdisk"
-	     android:storageDescription="@string/storage_usb"
-	     android:removable="true" />
+        android:storageDescription="@string/storage_usb"
+        android:removable="true" />
 </StorageList>

recovery.fstab

@@ -0,0 +1 @@
+recovery/root/etc/twrp.fstab

recovery/root/etc/twrp.fstab

@@ -1,12 +1,9 @@
-# mount point fstype device [device2] [length=]
-
-/boot			emmc		/dev/block/mmcblk0p20
-/recovery		emmc		/dev/block/mmcblk0p21
-/system			ext4		/dev/block/mmcblk0p22
-/data			ext4		/dev/block/mmcblk0p23	length=-16384
-/cache			ext4		/dev/block/mmcblk0p24
-/misc			emmc		/dev/block/mmcblk0p31
-/sdcard			vfat		/dev/block/mmcblk1p1	/dev/block/mmcblk1	flags=display="MicroSD card";storage;wipeingui;removable
-/sd-ext			ext4		/dev/block/mmcblk1p2				flags=display="SD-Ext";wipeingui;removable
-#/usb-otg		vfat		/dev/block/sda1		/dev/block/sda		flags=display="USB OTG";storage;wipeingui;removable
+# mount point   fstype          device                  [device2] [length=]
 
+/boot           emmc            /dev/block/mmcblk0p20
+/recovery       emmc            /dev/block/mmcblk0p21
+/system         ext4            /dev/block/mmcblk0p23
+/data           f2fs            /dev/block/mmcblk1      length=-16384
+/cache          ext4            /dev/block/mmcblk0p22
+/misc           emmc            /dev/block/mmcblk0p31
+/usbdisk        vfat            /dev/block/sda1         /dev/block/sda          flags=display="usbdisk";storage;wipeingui;removable