Add changes for fvp lollipop based on linaro-fvp-kk

Also change the product name to fvp instead of vexpress

Change-Id: I659b7820e36bbbf1a8138e7a84c930f7ff60c050
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

7 files changed, 64 insertions, 45 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index c0d94f9..1af187f 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -10,4 +10,4 @@
 #
 
 PRODUCT_MAKEFILES := \
-$(LOCAL_DIR)/vexpress.mk
+$(LOCAL_DIR)/fvp.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index cc31b8a..e91c7d8 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -15,9 +15,10 @@ TARGET_USES_64_BIT_BINDER := true
 TARGET_SUPPORTS_32_BIT_APPS := true
 TARGET_SUPPORTS_64_BIT_APPS := true
 
-TARGET_BOARD_PLATFORM := vexpress
+TARGET_BOARD_PLATFORM := fvp
 ANDROID_64=true
 WITH_DEXPREOPT ?= true
+USE_OPENGL_RENDERER := true
 
 ifeq ($(strip $(USE_LINARO_TOOLCHAIN)),true)
 # 64bit toolchain
@@ -58,7 +59,7 @@ BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_FLASH_BLOCK_SIZE := 512
 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
 
-BOARD_SEPOLICY_DIRS += device/linaro/common/sepolicy
+BOARD_SEPOLICY_DIRS += device/linaro/build/sepolicy
 BOARD_SEPOLICY_UNION += \
         init.te  \
         kernel.te  \
diff --git a/android-quirks.conf b/android-quirks.conf
index 6897f67..69fb2c9 100644
--- a/android-quirks.conf
+++ b/android-quirks.conf
@@ -1,3 +1,4 @@
+CONFIG_EXT4_FS_SECURITY=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
diff --git a/device.mk b/device.mk
index 0826a9d..1b5bc32 100644
--- a/device.mk
+++ b/device.mk
@@ -34,7 +34,7 @@ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
                         $(LOCAL_PATH)/preboot/fip.bin:boot/fvp_fip.bin)
 
 # Set custom settings
-DEVICE_PACKAGE_OVERLAYS := device/linaro/vexpress/overlay
+DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
 
 # FVP base models do s/w rendering
 PRODUCT_PACKAGES += libGLES_android
@@ -57,31 +57,31 @@ ADDITIONAL_DEFAULT_PROPERTIES += ro.debuggable=1
 ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dex2oat-filter=""
 
 PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
-                        device/linaro/common/android.hardware.screen.xml:system/etc/permissions/android.hardware.screen.xml \
+                        device/linaro/build/android.hardware.screen.xml:system/etc/permissions/android.hardware.screen.xml \
 			frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \
 			frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml)
 
 PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
-                        device/linaro/common/eth0_dns.sh:system/bin/eth0_dns.sh)
+                        device/linaro/build/eth0_dns.sh:system/bin/eth0_dns.sh)
 
 # Copy media codecs config file
-PRODUCT_COPY_FILES += device/linaro/common/media_codecs.xml:system/etc/media_codecs.xml
+PRODUCT_COPY_FILES += device/linaro/build/media_codecs.xml:system/etc/media_codecs.xml
 
 # Include application and binaries needed for test
-$(call inherit-product-if-exists, device/linaro/common/extra-and-tests.mk)
+$(call inherit-product-if-exists, device/linaro/build/extra-and-tests.mk)
 
 # Include Android userspace tests
 $(call inherit-product-if-exists, external/linaro-android-userspace-test/product.mk)
 
 ####### Copy build and install howtos for this build ########
 define copy-howto
-ifneq ($(wildcard $(TOP)/device/linaro/vexpress/howto/$(LINARO_BUILD_SPEC)/$1),)
+ifneq ($(wildcard $(TOP)/$(LOCAL_PATH)/howto/$(LINARO_BUILD_SPEC)/$1),)
 PRODUCT_COPY_FILES += \
-        device/linaro/vexpress/howto/$(LINARO_BUILD_SPEC)/$1:$1
+        $(LOCAL_PATH)/howto/$(LINARO_BUILD_SPEC)/$1:$1
 else
-ifneq ($(wildcard $(TOP)/device/linaro/vexpress/howto/default/$1),)
+ifneq ($(wildcard $(TOP)/$(LOCAL_PATH)/howto/default/$1),)
 PRODUCT_COPY_FILES += \
-        device/linaro/vexpress/howto/default/$1:$1
+        $(LOCAL_PATH)/howto/default/$1:$1
 endif
 endif
 endef
diff --git a/vexpress.mk b/fvp.mk
index 0988952..3753306 100644
--- a/vexpress.mk
+++ b/fvp.mk
@@ -1,9 +1,9 @@
 #
 # Inherit the full_base and device configurations
-$(call inherit-product, device/linaro/vexpress/device.mk)
+$(call inherit-product, $(LOCAL_PATH)/device.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 
 #
 # Overrides
-PRODUCT_NAME := vexpress
-PRODUCT_DEVICE := vexpress
+PRODUCT_NAME := fvp
+PRODUCT_DEVICE := fvp
diff --git a/init.rc b/init.rc
index 1ca554d..94d542b 100644
--- a/init.rc
+++ b/init.rc
@@ -12,7 +12,7 @@ import /init.trace.rc
 
 on early-init
     # Set init and its forked children's oom_adj.
-    write /proc/1/oom_adj -16
+    write /proc/1/oom_score_adj -1000
 
     # Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls.
     write /sys/fs/selinux/checkreqprot 0
@@ -88,6 +88,10 @@ on init
     mkdir /mnt/obb 0700 root system
     mount tmpfs tmpfs /mnt/obb mode=0755,gid=1000
 
+    # memory control cgroup
+    mkdir /dev/memcg 0700 root system
+    mount cgroup none /dev/memcg memory
+
     write /proc/sys/kernel/panic_on_oops 1
     write /proc/sys/kernel/hung_task_timeout_secs 0
     write /proc/cpu/alignment 4
@@ -267,6 +271,7 @@ on post-fs-data
     mkdir /data/misc/wifi 0770 wifi wifi
     mkdir /data/misc/wifi/sockets 0770 wifi wifi
     mkdir /data/misc/wifi/wpa_supplicant 0770 wifi wifi
+    mkdir /data/misc/ethernet 0770 system system
     mkdir /data/misc/dhcp 0770 dhcp dhcp
     mkdir /data/misc/user 0771 root root
     # give system access to wpa_supplicant.conf for backup and restore
@@ -285,7 +290,7 @@ on post-fs-data
     mkdir /data/property 0700 root root
 
     # create dalvik-cache, so as to enforce our permissions
-    mkdir /data/dalvik-cache 0771 system system
+    mkdir /data/dalvik-cache 0771 root root
     mkdir /data/dalvik-cache/profiles 0711 system system
 
     # create resource-cache and double-check the perms
@@ -337,9 +342,9 @@ on boot
     write /proc/sys/vm/overcommit_memory 1
     write /proc/sys/vm/min_free_order_shift 4
     chown root system /sys/module/lowmemorykiller/parameters/adj
-    chmod 0664 /sys/module/lowmemorykiller/parameters/adj
+    chmod 0220 /sys/module/lowmemorykiller/parameters/adj
     chown root system /sys/module/lowmemorykiller/parameters/minfree
-    chmod 0664 /sys/module/lowmemorykiller/parameters/minfree
+    chmod 0220 /sys/module/lowmemorykiller/parameters/minfree
 
     # Tweak background writeout
     write /proc/sys/vm/dirty_expire_centisecs 200
@@ -409,30 +414,22 @@ on boot
     chown system system /sys/kernel/ipv4/tcp_rmem_max
     chown root radio /proc/cmdline
 
-    # Define TCP buffer sizes for various networks
-    #   ReadMin, ReadInitial, ReadMax, WriteMin, WriteInitial, WriteMax,
-    setprop net.tcp.buffersize.default  4096,87380,110208,4096,16384,110208
-    setprop net.tcp.buffersize.wifi     524288,1048576,2097152,262144,524288,1048576
-    setprop net.tcp.buffersize.ethernet 524288,1048576,3145728,524288,1048576,2097152
-    setprop net.tcp.buffersize.lte      524288,1048576,2097152,262144,524288,1048576
-    setprop net.tcp.buffersize.umts     58254,349525,1048576,58254,349525,1048576
-    setprop net.tcp.buffersize.hspa     40778,244668,734003,16777,100663,301990
-    setprop net.tcp.buffersize.hsupa    40778,244668,734003,16777,100663,301990
-    setprop net.tcp.buffersize.hsdpa    61167,367002,1101005,8738,52429,262114
-    setprop net.tcp.buffersize.hspap    122334,734003,2202010,32040,192239,576717
-    setprop net.tcp.buffersize.edge     4093,26280,70800,4096,16384,70800
-    setprop net.tcp.buffersize.gprs     4092,8760,48000,4096,8760,48000
-    setprop net.tcp.buffersize.evdo     4094,87380,262144,4096,16384,262144
-
     # Define default initial receive window size in segments.
     setprop net.tcp.default_init_rwnd 60
 
     class_start core
-    class_start main
 
 on nonencrypted
+    class_start main
     class_start late_start
 
+on property:vold.decrypt=trigger_default_encryption
+    start defaultcrypto
+
+on property:vold.decrypt=trigger_encryption
+    start surfaceflinger
+    start encrypt
+
 on property:sys.init_log_level=*
     loglevel ${sys.init_log_level}
 
@@ -492,11 +489,6 @@ service healthd /sbin/healthd
     critical
     seclabel u:r:healthd:s0
 
-service healthd-charger /sbin/healthd -n
-    class charger
-    critical
-    seclabel u:r:healthd:s0
-
 service console /system/bin/sh
     class core
     console
@@ -518,6 +510,11 @@ service adbd /sbin/adbd --root_seclabel=u:r:su:s0
 on property:ro.kernel.qemu=1
     start adbd
 
+service lmkd /system/bin/lmkd
+    class core
+    critical
+    socket lmkd seqpacket 0660 system system
+
 service servicemanager /system/bin/servicemanager
     class core
     user system
@@ -555,7 +552,7 @@ service ril-daemon /system/bin/rild
     group radio cache inet misc audio log
 
 service surfaceflinger /system/bin/surfaceflinger
-    class main
+    class core
     user system
     group graphics drmrpc
     onrestart restart zygote
@@ -571,10 +568,24 @@ service media /system/bin/mediaserver
     group audio camera inet net_bt net_bt_admin net_bw_acct drmrpc mediadrm
     ioprio rt 4
 
+# One shot invocation to deal with encrypted volume.
+service defaultcrypto /system/bin/vdc --wait cryptfs mountdefaultencrypted
+    disabled
+    oneshot
+    # vold will set vold.decrypt to trigger_restart_framework (default
+    # encryption) or trigger_restart_min_framework (other encryption)
+
+# One shot invocation to encrypt unencrypted volumes
+service encrypt /system/bin/vdc --wait cryptfs enablecrypto inplace default
+    disabled
+    oneshot
+    # vold will set vold.decrypt to trigger_restart_framework (default
+    # encryption)
+
 service bootanim /system/bin/bootanimation
-    class main
+    class core
     user graphics
-    group graphics
+    group graphics audio
     disabled
     oneshot
 
@@ -582,8 +593,9 @@ service installd /system/bin/installd
     class main
     socket installd stream 600 system system
 
-service flash_recovery /system/etc/install-recovery.sh
+service flash_recovery /system/bin/install-recovery.sh
     class main
+    seclabel u:r:install_recovery:s0
     oneshot
 
 service racoon /system/bin/racoon
@@ -620,3 +632,8 @@ service mdnsd /system/bin/mdnsd
     socket mdnsd stream 0660 mdnsr inet
     disabled
     oneshot
+
+service pre-recovery /system/bin/uncrypt
+    class main
+    disabled
+    oneshot
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 5cef75a..7c3208e 100755
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -20,4 +20,4 @@
 # In particular, you can add lunch options with the add_lunch_combo
 # function: add_lunch_combo generic-eng
 
-add_lunch_combo vexpress-eng
+add_lunch_combo fvp-eng