diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2014-11-05 18:22:50 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2014-11-06 14:54:32 +0000 |
| commit | 49a30e7d179d4e529c0f79b637a4f69e43430f82 (patch) | |
| tree | 03d1820db5cc7755bcdfa182d4f6df6fbc218c75 | |
| parent | 518514580a21ee4e51fe6364728bf94839ace431 (diff) | |
| download | vendor_replicant-49a30e7d179d4e529c0f79b637a4f69e43430f82.tar.gz vendor_replicant-49a30e7d179d4e529c0f79b637a4f69e43430f82.tar.bz2 vendor_replicant-49a30e7d179d4e529c0f79b637a4f69e43430f82.zip | |
Updates for CM12
| -rw-r--r-- | config/common.mk | 6 | ||||
| -rw-r--r-- | prebuilt/common/bin/backuptool.functions | 2 | ||||
| -rwxr-xr-x | prebuilt/common/bin/backuptool.sh | 2 | ||||
| -rw-r--r-- | sepolicy/fs_use | 3 | ||||
| -rw-r--r-- | sepolicy/sepolicy.mk | 1 | ||||
| -rw-r--r-- | sepolicy/system.te | 2 | ||||
| -rw-r--r-- | sepolicy/vold.te | 3 |
7 files changed, 7 insertions, 12 deletions
diff --git a/config/common.mk b/config/common.mk index d32640c8..197e906a 100644 --- a/config/common.mk +++ b/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 diff --git a/prebuilt/common/bin/backuptool.functions b/prebuilt/common/bin/backuptool.functions index 6c01da0a..10d66a45 100644 --- a/prebuilt/common/bin/backuptool.functions +++ b/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 diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh index 9bd9c127..35ba51ce 100755 --- a/prebuilt/common/bin/backuptool.sh +++ b/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() { diff --git a/sepolicy/fs_use b/sepolicy/fs_use deleted file mode 100644 index 2001c9c6..00000000 --- a/sepolicy/fs_use +++ /dev/null @@ -1,3 +0,0 @@ -# Label inodes via getxattr. -fs_use_xattr f2fs u:object_r:labeledfs:s0; - diff --git a/sepolicy/sepolicy.mk b/sepolicy/sepolicy.mk index a4690157..45792a19 100644 --- a/sepolicy/sepolicy.mk +++ b/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 \ diff --git a/sepolicy/system.te b/sepolicy/system.te index acf8fede..4c6de38f 100644 --- a/sepolicy/system.te +++ b/sepolicy/system.te @@ -1 +1 @@ -allow system wallpaper_file:file relabelto; +allow system_server wallpaper_file:file relabelto; diff --git a/sepolicy/vold.te b/sepolicy/vold.te index 3082575e..ae52a5fa 100644 --- a/sepolicy/vold.te +++ b/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; |