Updates for CM12

config/common.mk

@@ -218,8 +218,8 @@ PRODUCT_PACKAGES += \
 
 # Terminal Emulator
 PRODUCT_COPY_FILES +=  \
-    vendor/cm/proprietary/Term.apk:system/app/Term.apk \
-    vendor/cm/proprietary/lib/armeabi/libjackpal-androidterm4.so:system/lib/libjackpal-androidterm4.so
+    vendor/cm/proprietary/Term.apk:system/app/Term/Term.apk \
+    vendor/cm/proprietary/lib/armeabi/libjackpal-androidterm4.so:system/app/Term/lib/arm/libjackpal-androidterm4.so
 
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.sys.root_access=1
@@ -232,7 +232,7 @@ endif
 
 PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/common
 
-PRODUCT_VERSION_MAJOR = 11
+PRODUCT_VERSION_MAJOR = 12
 PRODUCT_VERSION_MINOR = 0
 PRODUCT_VERSION_MAINTENANCE = 0-RC0
 

prebuilt/common/bin/backuptool.functions

@@ -5,7 +5,7 @@
 
 export C=/tmp/backupdir
 export S=/system
-export V=11
+export V=12
 
 backup_file() {
   if [ -e "$1" ]; then

prebuilt/common/bin/backuptool.sh

@@ -5,7 +5,7 @@
 
 export C=/tmp/backupdir
 export S=/system
-export V=11
+export V=12
 
 # Preserve /system/addon.d in /tmp/addon.d
 preserve_addon_d() {

sepolicy/fs_use

@@ -1,3 +0,0 @@
-# Label inodes via getxattr.
-fs_use_xattr f2fs u:object_r:labeledfs:s0;
-

sepolicy/sepolicy.mk

@@ -9,7 +9,6 @@ BOARD_SEPOLICY_DIRS += \
 BOARD_SEPOLICY_UNION += \
     file.te \
     file_contexts \
-    fs_use \
     genfs_contexts \
     seapp_contexts \
     installd.te \

sepolicy/system.te

@@ -1 +1 @@
-allow system wallpaper_file:file relabelto;
+allow system_server wallpaper_file:file relabelto;

sepolicy/vold.te

@@ -2,9 +2,8 @@
 allow vold sdcard_external:file create_file_perms;
 
 # Allow vold to change context for mounted ext4 sdcard
-relabelto_domain(vold)
 allow vold labeledfs:filesystem { relabelfrom };
-allow vold sdcard_external:filesystem { relabelfrom relabelto };
+allow vold sdcard_external:filesystem { relabelfrom };
 
 # Allow vold to access fuse for fuse-based fs
 allow vold fuse_device:chr_file rw_file_perms;