Update Nexus 5x mock test

3 files changed, 602 insertions, 350 deletions

diff --git a/test/cpuinfo/nexus5x.armeabi.log b/test/cpuinfo/nexus5x.armeabi.log
new file mode 100644
index 0000000..44ec711
--- /dev/null
+++ b/test/cpuinfo/nexus5x.armeabi.log
@@ -0,0 +1,49 @@
+processor	: 0
+Features	: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt evtstrm aes pmull sha1 sha2 crc32
+CPU implementer	: 0x41
+CPU architecture: 8
+CPU variant	: 0x0
+CPU part	: 0xd03
+CPU revision	: 3
+
+processor	: 1
+Features	: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt evtstrm aes pmull sha1 sha2 crc32
+CPU implementer	: 0x41
+CPU architecture: 8
+CPU variant	: 0x0
+CPU part	: 0xd03
+CPU revision	: 3
+
+processor	: 2
+Features	: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt evtstrm aes pmull sha1 sha2 crc32
+CPU implementer	: 0x41
+CPU architecture: 8
+CPU variant	: 0x0
+CPU part	: 0xd03
+CPU revision	: 3
+
+processor	: 3
+Features	: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt evtstrm aes pmull sha1 sha2 crc32
+CPU implementer	: 0x41
+CPU architecture: 8
+CPU variant	: 0x0
+CPU part	: 0xd03
+CPU revision	: 3
+
+processor	: 4
+Features	: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt evtstrm aes pmull sha1 sha2 crc32
+CPU implementer	: 0x41
+CPU architecture: 8
+CPU variant	: 0x1
+CPU part	: 0xd07
+CPU revision	: 2
+
+processor	: 5
+Features	: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt evtstrm aes pmull sha1 sha2 crc32
+CPU implementer	: 0x41
+CPU architecture: 8
+CPU variant	: 0x1
+CPU part	: 0xd07
+CPU revision	: 2
+
+Hardware	: Qualcomm Technologies, Inc MSM8992
diff --git a/test/cpuinfo/nexus5x.log b/test/cpuinfo/nexus5x.log
index 2bf25d2..cbe7ce5 100644
--- a/test/cpuinfo/nexus5x.log
+++ b/test/cpuinfo/nexus5x.log
@@ -1,15 +1,49 @@
-Processor	: AArch64 Processor rev 3 (aarch64)
 processor	: 0
+Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32
+CPU implementer	: 0x41
+CPU architecture: 8
+CPU variant	: 0x0
+CPU part	: 0xd03
+CPU revision	: 3
+
 processor	: 1
+Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32
+CPU implementer	: 0x41
+CPU architecture: 8
+CPU variant	: 0x0
+CPU part	: 0xd03
+CPU revision	: 3
+
 processor	: 2
+Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32
+CPU implementer	: 0x41
+CPU architecture: 8
+CPU variant	: 0x0
+CPU part	: 0xd03
+CPU revision	: 3
+
 processor	: 3
-processor	: 4
-processor	: 5
-Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32 
+Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32
 CPU implementer	: 0x41
 CPU architecture: 8
 CPU variant	: 0x0
 CPU part	: 0xd03
 CPU revision	: 3
 
+processor	: 4
+Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32
+CPU implementer	: 0x41
+CPU architecture: 8
+CPU variant	: 0x1
+CPU part	: 0xd07
+CPU revision	: 2
+
+processor	: 5
+Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32
+CPU implementer	: 0x41
+CPU architecture: 8
+CPU variant	: 0x1
+CPU part	: 0xd07
+CPU revision	: 2
+
 Hardware	: Qualcomm Technologies, Inc MSM8992
diff --git a/test/mock/nexus5x.h b/test/mock/nexus5x.h
index 4240055..b80b6db 100644
--- a/test/mock/nexus5x.h
+++ b/test/mock/nexus5x.h
@@ -1,186 +1,234 @@
 struct cpuinfo_mock_file filesystem[] = {
+#if CPUINFO_ARCH_ARM64
 	{
 		.path = "/proc/cpuinfo",
-		.size = 327,
+		.size = 1030,
 		.content =
-			"Processor\t: AArch64 Processor rev 3 (aarch64)\n"
 			"processor\t: 0\n"
+			"Features\t: fp asimd evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x0\n"
+			"CPU part\t: 0xd03\n"
+			"CPU revision\t: 3\n"
+			"\n"
 			"processor\t: 1\n"
+			"Features\t: fp asimd evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x0\n"
+			"CPU part\t: 0xd03\n"
+			"CPU revision\t: 3\n"
+			"\n"
 			"processor\t: 2\n"
+			"Features\t: fp asimd evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x0\n"
+			"CPU part\t: 0xd03\n"
+			"CPU revision\t: 3\n"
+			"\n"
 			"processor\t: 3\n"
-			"processor\t: 4\n"
-			"processor\t: 5\n"
-			"Features\t: fp asimd evtstrm aes pmull sha1 sha2 crc32 \n"
+			"Features\t: fp asimd evtstrm aes pmull sha1 sha2 crc32\n"
 			"CPU implementer\t: 0x41\n"
 			"CPU architecture: 8\n"
 			"CPU variant\t: 0x0\n"
 			"CPU part\t: 0xd03\n"
 			"CPU revision\t: 3\n"
 			"\n"
+			"processor\t: 4\n"
+			"Features\t: fp asimd evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x1\n"
+			"CPU part\t: 0xd07\n"
+			"CPU revision\t: 2\n"
+			"\n"
+			"processor\t: 5\n"
+			"Features\t: fp asimd evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x1\n"
+			"CPU part\t: 0xd07\n"
+			"CPU revision\t: 2\n"
+			"\n"
 			"Hardware\t: Qualcomm Technologies, Inc MSM8992\n",
 	},
+#elif CPUINFO_ARCH_ARM
 	{
-		.path = "/system/build.prop",
-		.size = 4876,
+		.path = "/proc/cpuinfo",
+		.size = 1348,
 		.content =
+			"processor\t: 0\n"
+			"Features\t: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x0\n"
+			"CPU part\t: 0xd03\n"
+			"CPU revision\t: 3\n"
+			"\n"
+			"processor\t: 1\n"
+			"Features\t: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x0\n"
+			"CPU part\t: 0xd03\n"
+			"CPU revision\t: 3\n"
+			"\n"
+			"processor\t: 2\n"
+			"Features\t: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x0\n"
+			"CPU part\t: 0xd03\n"
+			"CPU revision\t: 3\n"
+			"\n"
+			"processor\t: 3\n"
+			"Features\t: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x0\n"
+			"CPU part\t: 0xd03\n"
+			"CPU revision\t: 3\n"
 			"\n"
-			"# begin build properties\n"
-			"# autogenerated by buildinfo.sh\n"
-			"ro.build.id=NMF26F\n"
-			"ro.build.display.id=NMF26F\n"
-			"ro.build.version.incremental=3425388\n"
-			"ro.build.version.sdk=25\n"
-			"ro.build.version.preview_sdk=0\n"
-			"ro.build.version.codename=REL\n"
-			"ro.build.version.all_codenames=REL\n"
-			"ro.build.version.release=7.1.1\n"
-			"ro.build.version.security_patch=2016-12-05\n"
-			"ro.build.version.base_os=\n"
-			"ro.build.date=Tue Nov  1 18:22:15 UTC 2016\n"
-			"ro.build.date.utc=1478024535\n"
-			"ro.build.type=user\n"
-			"ro.build.user=android-build\n"
-			"ro.build.host=vpec15.mtv.corp.google.com\n"
-			"ro.build.tags=release-keys\n"
-			"ro.build.flavor=bullhead-user\n"
-			"ro.product.model=Nexus 5X\n"
-			"ro.product.brand=google\n"
-			"ro.product.name=bullhead\n"
-			"ro.product.device=bullhead\n"
-			"ro.product.board=bullhead\n"
-			"# ro.product.cpu.abi and ro.product.cpu.abi2 are obsolete,\n"
-			"# use ro.product.cpu.abilist instead.\n"
-			"ro.product.cpu.abi=arm64-v8a\n"
-			"ro.product.cpu.abilist=arm64-v8a,armeabi-v7a,armeabi\n"
-			"ro.product.cpu.abilist32=armeabi-v7a,armeabi\n"
-			"ro.product.cpu.abilist64=arm64-v8a\n"
-			"ro.product.manufacturer=LGE\n"
-			"ro.product.locale=en-US\n"
-			"ro.wifi.channels=\n"
-			"ro.board.platform=msm8992\n"
-			"# ro.build.product is obsolete; use ro.product.device\n"
-			"ro.build.product=bullhead\n"
-			"# Do not try to parse description, fingerprint, or thumbprint\n"
-			"ro.build.description=bullhead-user 7.1.1 NMF26F 3425388 release-keys\n"
-			"ro.build.fingerprint=google/bullhead/bullhead:7.1.1/NMF26F/3425388:user/release-keys\n"
-			"ro.build.characteristics=nosdcard\n"
-			"# end build properties\n"
+			"processor\t: 4\n"
+			"Features\t: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x1\n"
+			"CPU part\t: 0xd07\n"
+			"CPU revision\t: 2\n"
+			"\n"
+			"processor\t: 5\n"
+			"Features\t: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt evtstrm aes pmull sha1 sha2 crc32\n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x1\n"
+			"CPU part\t: 0xd07\n"
+			"CPU revision\t: 2\n"
 			"\n"
-			"#\n"
-			"# ADDITIONAL_BUILD_PROPERTIES\n"
-			"#\n"
-			"ro.config.ringtone=Titania.ogg\n"
-			"ro.config.notification_sound=Tethys.ogg\n"
-			"ro.config.alarm_alert=Oxygen.ogg\n"
-			"ro.com.android.dataroaming=false\n"
-			"ro.url.legal=http://www.google.com/intl/%s/mobile/android/basic/phone-legal.html\n"
-			"ro.url.legal.android_privacy=http://www.google.com/intl/%s/mobile/android/basic/privacy.html\n"
-			"ro.com.google.clientidbase=android-google\n"
-			"ro.carrier=unknown\n"
-			"ro.com.android.wifi-watchlist=GoogleGuest\n"
-			"ro.error.receiver.system.apps=com.google.android.gms\n"
-			"ro.setupwizard.enterprise_mode=1\n"
-			"ro.atrace.core.services=com.google.android.gms,com.google.android.gms.ui,com.google.android.gms.persistent\n"
-			"ro.retaildemo.video_path=/data/preloads/demo/retail_demo.mp4\n"
-			"ro.com.android.prov_mobiledata=false\n"
-			"media.aac_51_output_enabled=true\n"
-			"ro.qc.sdk.audio.fluencetype=fluencepro\n"
-			"persist.audio.fluence.voicecall=true\n"
-			"persist.audio.fluence.voicecomm=true\n"
-			"persist.audio.fluence.voicerec=false\n"
-			"persist.audio.fluence.speaker=true\n"
-			"persist.speaker.prot.enable=true\n"
-			"ro.config.vc_call_vol_steps=7\n"
-			"af.fast_track_multiplier=1\n"
-			"audio_hal.period_size=192\n"
-			"wifi.interface=wlan0\n"
-			"wifi.supplicant_scan_interval=15\n"
-			"ro.opengles.version=196610\n"
-			"ro.sf.lcd_density=420\n"
-			"persist.hwc.mdpcomp.enable=true\n"
-			"vidc.debug.perf.mode=2\n"
-			"vidc.enc.dcvs.extra-buff-count=2\n"
-			"ro.hwui.texture_cache_size=56\n"
-			"ro.hwui.layer_cache_size=32\n"
-			"ro.hwui.r_buffer_cache_size=8\n"
-			"ro.hwui.path_cache_size=16\n"
-			"ro.hwui.gradient_cache_size=1\n"
-			"ro.hwui.drop_shadow_cache_size=6\n"
-			"ro.hwui.texture_cache_flushrate=0.4\n"
-			"ro.hwui.text_small_cache_width=1024\n"
-			"ro.hwui.text_small_cache_height=1024\n"
-			"ro.hwui.text_large_cache_width=2048\n"
-			"ro.hwui.text_large_cache_height=1024\n"
-			"ro.frp.pst=/dev/block/platform/soc.0/f9824900.sdhci/by-name/persistent\n"
-			"drm.service.enabled=true\n"
-			"ro.min_freq_0=384000\n"
-			"ro.vendor.extension_library=libqti-perfd-client.so\n"
-			"rild.libpath=/vendor/lib64/libril-qc-qmi-1.so\n"
-			"ro.telephony.default_cdma_sub=0\n"
-			"persist.qcril.disable_retry=true\n"
-			"ro.telephony.default_network=22\n"
-			"telephony.lteOnCdmaDevice=1\n"
-			"persist.radio.mode_pref_nv10=1\n"
-			"ril.nosim.ecc_list_count=1\n"
-			"ril.nosim.ecc_list_1=111,113,117,122,125\n"
-			"ro.audio.flinger_standbytime_ms=300\n"
-			"persist.radio.apm_sim_not_pwdn=1\n"
-			"persist.radio.custom_ecc=1\n"
-			"persist.data.iwlan.enable=true\n"
-			"persist.radio.always_send_plmn=true\n"
-			"ro.telephony.call_ring.multiple=0\n"
-			"persist.radio.use_cc_names=true\n"
-			"persist.radio.data_no_toggle=1\n"
-			"persist.radio.process_sups_ind=1\n"
-			"persist.radio.eri64_as_home=1\n"
-			"persist.radio.data_con_rprt=true\n"
-			"qcom.bluetooth.soc=rome\n"
-			"bluetooth.enable_timeout_ms=12000\n"
-			"dalvik.vm.boot-dex2oat-threads=4\n"
-			"dalvik.vm.dex2oat-threads=4\n"
-			"dalvik.vm.image-dex2oat-threads=4\n"
-			"persist.camera.tnr.preview=0\n"
-			"persist.camera.tnr.video=0\n"
-			"persist.radio.redir_party_num=0\n"
-			"ro.camera.notify_nfc=1\n"
-			"dalvik.vm.heapstartsize=8m\n"
-			"dalvik.vm.heapgrowthlimit=192m\n"
-			"dalvik.vm.heapsize=512m\n"
-			"dalvik.vm.heaptargetutilization=0.75\n"
-			"dalvik.vm.heapminfree=512k\n"
-			"dalvik.vm.heapmaxfree=8m\n"
-			"keyguard.no_require_sim=true\n"
-			"ro.setupwizard.rotation_locked=true\n"
-			"ro.facelock.black_timeout=700\n"
-			"ro.facelock.det_timeout=2500\n"
-			"ro.facelock.rec_timeout=3500\n"
-			"ro.facelock.est_max_time=600\n"
-			"persist.sys.dalvik.vm.lib.2=libart.so\n"
-			"dalvik.vm.isa.arm64.variant=cortex-a53\n"
-			"dalvik.vm.isa.arm64.features=default\n"
-			"dalvik.vm.isa.arm.variant=cortex-a53.a57\n"
-			"dalvik.vm.isa.arm.features=default\n"
-			"net.bt.name=Android\n"
-			"dalvik.vm.stack-trace-file=/data/anr/traces.txt\n"
-			"ro.build.expect.bootloader=BHZ11h\n"
-			"ro.build.expect.baseband=M8994F-2.6.36.2.20\n"
-			"ro.expect.recovery_id=0xc3fa4d20943e3f2c988a1ee26f54d3982287ac4b000000000000000000000000\n"
-			"\n",
+			"Hardware\t: Qualcomm Technologies, Inc MSM8992\n",
 	},
+#endif
 	{
-		.path = "/sys/devices/system/cpu/kernel_max",
+		.path = "/sys/class/kgsl/kgsl-3d0/default_pwrlevel",
 		.size = 2,
 		.content = "5\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/possible",
+		.path = "/sys/class/kgsl/kgsl-3d0/max_gpuclk",
+		.size = 10,
+		.content = "600000000\n",
+	},
+	{
+		.path = "/sys/devices/soc0/accessory_chip",
+		.size = 2,
+		.content = "0\n",
+	},
+	{
+		.path = "/sys/devices/soc0/build_id",
+		.size = 25,
+		.content = "8992A-ESAAANAZA-40000000\n",
+	},
+	{
+		.path = "/sys/devices/soc0/foundry_id",
+		.size = 2,
+		.content = "0\n",
+	},
+	{
+		.path = "/sys/devices/soc0/hw_platform",
+		.size = 7,
+		.content = "(null)\n",
+	},
+	{
+		.path = "/sys/devices/soc0/image_crm_version",
+		.size = 12,
+		.content = "LGEARND7B14\n",
+	},
+	{
+		.path = "/sys/devices/soc0/image_variant",
+		.size = 10,
+		.content = "ESAAANAZA\n",
+	},
+	{
+		.path = "/sys/devices/soc0/image_version",
+		.size = 21,
+		.content = "00:BOOT.BF.2.3-00366\n",
+	},
+	{
+		.path = "/sys/devices/soc0/machine",
+		.size = 11,
+		.content = "Snapdragon\n",
+	},
+	{
+		.path = "/sys/devices/soc0/platform_subtype",
+		.size = 8,
+		.content = "Unknown\n",
+	},
+	{
+		.path = "/sys/devices/soc0/platform_subtype_id",
+		.size = 2,
+		.content = "0\n",
+	},
+	{
+		.path = "/sys/devices/soc0/platform_version",
+		.size = 3,
+		.content = "11\n",
+	},
+	{
+		.path = "/sys/devices/soc0/pmic_die_revision",
+		.size = 7,
+		.content = "131072\n",
+	},
+	{
+		.path = "/sys/devices/soc0/pmic_model",
+		.size = 6,
+		.content = "65545\n",
+	},
+	{
+		.path = "/sys/devices/soc0/raw_id",
+		.size = 5,
+		.content = "2409\n",
+	},
+	{
+		.path = "/sys/devices/soc0/raw_version",
+		.size = 2,
+		.content = "0\n",
+	},
+	{
+		.path = "/sys/devices/soc0/revision",
 		.size = 4,
-		.content = "0-5\n",
+		.content = "1.0\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/present",
+		.path = "/sys/devices/soc0/select_image",
+		.size = 2,
+		.content = "0\n",
+	},
+	{
+		.path = "/sys/devices/soc0/soc_id",
 		.size = 4,
-		.content = "0-5\n",
+		.content = "251\n",
+	},
+	{
+		.path = "/sys/devices/soc0/vendor",
+		.size = 9,
+		.content = "Qualcomm\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/kernel_max",
+		.size = 2,
+		.content = "5\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/modalias",
+		.size = 66,
+		.content = "cpu:type:aarch64:feature:,0000,0001,0002,0003,0004,0005,0006,0007\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/offline",
+		.size = 4,
+		.content = "4-5\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/online",
@@ -188,14 +236,14 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "0-3\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/offline",
+		.path = "/sys/devices/system/cpu/possible",
 		.size = 4,
-		.content = "4-5\n",
+		.content = "0-5\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/modalias",
-		.size = 66,
-		.content = "cpu:type:aarch64:feature:,0000,0001,0002,0003,0004,0005,0006,0007\n",
+		.path = "/sys/devices/system/cpu/present",
+		.size = 4,
+		.content = "0-5\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpufreq/all_time_in_state",
@@ -224,6 +272,11 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "null\n",
 	},
 	{
+		.path = "/sys/devices/system/cpu/cpu0/cpuidle/driver/name",
+		.size = 9,
+		.content = "msm_idle\n",
+	},
+	{
 		.path = "/sys/devices/system/cpu/cpu0/cpufreq/affected_cpus",
 		.size = 8,
 		.content = "0 1 2 3\n",
@@ -280,45 +333,40 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state",
-		.size = 94,
+		.size = 95,
 		.content =
-			"384000 34\n"
-			"460800 74\n"
-			"600000 74\n"
-			"672000 58\n"
-			"787200 86\n"
-			"864000 26\n"
-			"960000 99\n"
-			"1248000 99\n"
-			"1440000 2781\n",
+			"384000 192\n"
+			"460800 44\n"
+			"600000 18\n"
+			"672000 5\n"
+			"787200 95\n"
+			"864000 42\n"
+			"960000 103\n"
+			"1248000 21\n"
+			"1440000 4796\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu0/cpufreq/stats/total_trans",
-		.size = 4,
-		.content = "131\n",
+		.size = 3,
+		.content = "56\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu0/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu0/topology/core_id",
 		.size = 2,
 		.content = "0\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu0/topology/core_siblings_list",
-		.size = 4,
-		.content = "0-3\n",
-	},
-	{
 		.path = "/sys/devices/system/cpu/cpu0/topology/core_siblings",
 		.size = 3,
 		.content = "0f\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu0/topology/core_id",
-		.size = 2,
-		.content = "0\n",
+		.path = "/sys/devices/system/cpu/cpu0/topology/core_siblings_list",
+		.size = 4,
+		.content = "0-3\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu0/topology/thread_siblings_list",
+		.path = "/sys/devices/system/cpu/cpu0/topology/physical_package_id",
 		.size = 2,
 		.content = "0\n",
 	},
@@ -328,6 +376,16 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "01\n",
 	},
 	{
+		.path = "/sys/devices/system/cpu/cpu0/topology/thread_siblings_list",
+		.size = 2,
+		.content = "0\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/cpu1/cpuidle/driver/name",
+		.size = 9,
+		.content = "msm_idle\n",
+	},
+	{
 		.path = "/sys/devices/system/cpu/cpu1/cpufreq/affected_cpus",
 		.size = 8,
 		.content = "0 1 2 3\n",
@@ -364,8 +422,8 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu1/cpufreq/scaling_cur_freq",
-		.size = 8,
-		.content = "1440000\n",
+		.size = 7,
+		.content = "384000\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu1/cpufreq/scaling_driver",
@@ -384,27 +442,32 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu1/cpufreq/stats/time_in_state",
-		.size = 94,
+		.size = 95,
 		.content =
-			"384000 34\n"
-			"460800 74\n"
-			"600000 74\n"
-			"672000 58\n"
-			"787200 86\n"
-			"864000 26\n"
-			"960000 99\n"
-			"1248000 99\n"
-			"1440000 3046\n",
+			"384000 283\n"
+			"460800 51\n"
+			"600000 25\n"
+			"672000 5\n"
+			"787200 99\n"
+			"864000 42\n"
+			"960000 127\n"
+			"1248000 23\n"
+			"1440000 4899\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu1/cpufreq/stats/total_trans",
-		.size = 4,
-		.content = "131\n",
+		.size = 3,
+		.content = "72\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu1/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu1/topology/core_id",
 		.size = 2,
-		.content = "0\n",
+		.content = "1\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/cpu1/topology/core_siblings",
+		.size = 3,
+		.content = "0f\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu1/topology/core_siblings_list",
@@ -412,14 +475,14 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "0-3\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu1/topology/core_siblings",
-		.size = 3,
-		.content = "0f\n",
+		.path = "/sys/devices/system/cpu/cpu1/topology/physical_package_id",
+		.size = 2,
+		.content = "0\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu1/topology/core_id",
-		.size = 2,
-		.content = "1\n",
+		.path = "/sys/devices/system/cpu/cpu1/topology/thread_siblings",
+		.size = 3,
+		.content = "02\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu1/topology/thread_siblings_list",
@@ -427,9 +490,9 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "1\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu1/topology/thread_siblings",
-		.size = 3,
-		.content = "02\n",
+		.path = "/sys/devices/system/cpu/cpu2/cpuidle/driver/name",
+		.size = 9,
+		.content = "msm_idle\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/cpufreq/affected_cpus",
@@ -468,8 +531,8 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/cpufreq/scaling_cur_freq",
-		.size = 8,
-		.content = "1440000\n",
+		.size = 7,
+		.content = "384000\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/cpufreq/scaling_driver",
@@ -488,27 +551,32 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/cpufreq/stats/time_in_state",
-		.size = 94,
+		.size = 95,
 		.content =
-			"384000 34\n"
-			"460800 74\n"
-			"600000 74\n"
-			"672000 58\n"
-			"787200 86\n"
-			"864000 26\n"
-			"960000 99\n"
-			"1248000 99\n"
-			"1440000 3314\n",
+			"384000 492\n"
+			"460800 59\n"
+			"600000 34\n"
+			"672000 5\n"
+			"787200 99\n"
+			"864000 42\n"
+			"960000 142\n"
+			"1248000 32\n"
+			"1440000 4899\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/cpufreq/stats/total_trans",
-		.size = 4,
-		.content = "131\n",
+		.size = 3,
+		.content = "86\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu2/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu2/topology/core_id",
 		.size = 2,
-		.content = "0\n",
+		.content = "2\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/cpu2/topology/core_siblings",
+		.size = 3,
+		.content = "0f\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/topology/core_siblings_list",
@@ -516,14 +584,14 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "0-3\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu2/topology/core_siblings",
-		.size = 3,
-		.content = "0f\n",
+		.path = "/sys/devices/system/cpu/cpu2/topology/physical_package_id",
+		.size = 2,
+		.content = "0\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu2/topology/core_id",
-		.size = 2,
-		.content = "2\n",
+		.path = "/sys/devices/system/cpu/cpu2/topology/thread_siblings",
+		.size = 3,
+		.content = "04\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/topology/thread_siblings_list",
@@ -531,9 +599,9 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "2\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu2/topology/thread_siblings",
-		.size = 3,
-		.content = "04\n",
+		.path = "/sys/devices/system/cpu/cpu3/cpuidle/driver/name",
+		.size = 9,
+		.content = "msm_idle\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/cpufreq/affected_cpus",
@@ -572,8 +640,8 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/cpufreq/scaling_cur_freq",
-		.size = 8,
-		.content = "1440000\n",
+		.size = 7,
+		.content = "384000\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/cpufreq/scaling_driver",
@@ -592,27 +660,32 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/cpufreq/stats/time_in_state",
-		.size = 94,
+		.size = 95,
 		.content =
-			"384000 34\n"
-			"460800 74\n"
-			"600000 74\n"
-			"672000 58\n"
-			"787200 86\n"
-			"864000 26\n"
-			"960000 99\n"
-			"1248000 99\n"
-			"1440000 3578\n",
+			"384000 703\n"
+			"460800 76\n"
+			"600000 36\n"
+			"672000 5\n"
+			"787200 99\n"
+			"864000 42\n"
+			"960000 157\n"
+			"1248000 40\n"
+			"1440000 4922\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/cpufreq/stats/total_trans",
 		.size = 4,
-		.content = "131\n",
+		.content = "102\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu3/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu3/topology/core_id",
 		.size = 2,
-		.content = "0\n",
+		.content = "3\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/cpu3/topology/core_siblings",
+		.size = 3,
+		.content = "0f\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/topology/core_siblings_list",
@@ -620,14 +693,14 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "0-3\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu3/topology/core_siblings",
-		.size = 3,
-		.content = "0f\n",
+		.path = "/sys/devices/system/cpu/cpu3/topology/physical_package_id",
+		.size = 2,
+		.content = "0\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu3/topology/core_id",
-		.size = 2,
-		.content = "3\n",
+		.path = "/sys/devices/system/cpu/cpu3/topology/thread_siblings",
+		.size = 3,
+		.content = "08\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/topology/thread_siblings_list",
@@ -635,13 +708,17 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "3\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu3/topology/thread_siblings",
-		.size = 3,
-		.content = "08\n",
+		.path = "/sys/devices/system/cpu/cpu4/cpuidle/driver/name",
+		.size = 9,
+		.content = "msm_idle\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/cpu5/cpuidle/driver/name",
+		.size = 9,
+		.content = "msm_idle\n",
 	},
 	{ NULL },
 };
-
 #ifdef __ANDROID__
 struct cpuinfo_mock_property properties[] = {
 	{
@@ -653,10 +730,6 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "192",
 	},
 	{
-		.key = "bluetooth.enable_timeout_ms",
-		.value = "12000",
-	},
-	{
 		.key = "dalvik.vm.appimageformat",
 		.value = "lz4",
 	},
@@ -677,6 +750,10 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "4",
 	},
 	{
+		.key = "dalvik.vm.dexopt.secondary",
+		.value = "true",
+	},
+	{
 		.key = "dalvik.vm.heapgrowthlimit",
 		.value = "192m",
 	},
@@ -758,7 +835,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "gsm.current.phone-type",
-		.value = "1",
+		.value = "2",
 	},
 	{
 		.key = "gsm.network.type",
@@ -778,7 +855,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "gsm.operator.numeric",
-		.value = "",
+		.value = "00000",
 	},
 	{
 		.key = "gsm.sim.operator.alpha",
@@ -786,25 +863,29 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "gsm.sim.operator.iso-country",
-		.value = "us",
+		.value = "",
 	},
 	{
 		.key = "gsm.sim.operator.numeric",
-		.value = "310410",
+		.value = "",
 	},
 	{
 		.key = "gsm.sim.state",
-		.value = "READY",
+		.value = "ABSENT",
 	},
 	{
 		.key = "gsm.version.baseband",
-		.value = "M8994F-2.6.36.2.20",
+		.value = "M8994F-2.6.39.3.03",
 	},
 	{
 		.key = "gsm.version.ril-impl",
 		.value = "Qualcomm RIL 1.0",
 	},
 	{
+		.key = "hwservicemanager.ready",
+		.value = "true",
+	},
+	{
 		.key = "init.svc.adbd",
 		.value = "running",
 	},
@@ -837,19 +918,19 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "running",
 	},
 	{
-		.key = "init.svc.debuggerd",
+		.key = "init.svc.configstore-hal-1-0",
 		.value = "running",
 	},
 	{
-		.key = "init.svc.debuggerd64",
-		.value = "running",
+		.key = "init.svc.devstart_sh",
+		.value = "stopped",
 	},
 	{
 		.key = "init.svc.drm",
 		.value = "running",
 	},
 	{
-		.key = "init.svc.fingerprintd",
+		.key = "init.svc.dumpstate-1-0",
 		.value = "running",
 	},
 	{
@@ -861,14 +942,34 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "stopped",
 	},
 	{
+		.key = "init.svc.fps_hal",
+		.value = "running",
+	},
+	{
 		.key = "init.svc.gatekeeperd",
 		.value = "running",
 	},
 	{
+		.key = "init.svc.gralloc-2-0",
+		.value = "running",
+	},
+	{
 		.key = "init.svc.healthd",
 		.value = "running",
 	},
 	{
+		.key = "init.svc.hidl_memory",
+		.value = "running",
+	},
+	{
+		.key = "init.svc.hostapd",
+		.value = "stopped",
+	},
+	{
+		.key = "init.svc.hwservicemanager",
+		.value = "running",
+	},
+	{
 		.key = "init.svc.imsdatadaemon",
 		.value = "running",
 	},
@@ -921,19 +1022,19 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "running",
 	},
 	{
-		.key = "init.svc.msm_irqbalance",
+		.key = "init.svc.mediametrics",
 		.value = "running",
 	},
 	{
-		.key = "init.svc.netd",
+		.key = "init.svc.msm_irqbalance",
 		.value = "running",
 	},
 	{
-		.key = "init.svc.netmgrd",
+		.key = "init.svc.netd",
 		.value = "running",
 	},
 	{
-		.key = "init.svc.p2p_supplicant",
+		.key = "init.svc.netmgrd",
 		.value = "running",
 	},
 	{
@@ -977,6 +1078,14 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "running",
 	},
 	{
+		.key = "init.svc.start_hci_filter",
+		.value = "running",
+	},
+	{
+		.key = "init.svc.storaged",
+		.value = "running",
+	},
+	{
 		.key = "init.svc.surfaceflinger",
 		.value = "running",
 	},
@@ -989,14 +1098,42 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "running",
 	},
 	{
+		.key = "init.svc.tombstoned",
+		.value = "running",
+	},
+	{
 		.key = "init.svc.ueventd",
 		.value = "running",
 	},
 	{
+		.key = "init.svc.usb-hal-1-0",
+		.value = "running",
+	},
+	{
+		.key = "init.svc.vndservicemanager",
+		.value = "running",
+	},
+	{
 		.key = "init.svc.vold",
 		.value = "running",
 	},
 	{
+		.key = "init.svc.webview_zygote32",
+		.value = "running",
+	},
+	{
+		.key = "init.svc.wifi_hal_legacy",
+		.value = "running",
+	},
+	{
+		.key = "init.svc.wificond",
+		.value = "running",
+	},
+	{
+		.key = "init.svc.wpa_supplicant",
+		.value = "running",
+	},
+	{
 		.key = "init.svc.zygote",
 		.value = "running",
 	},
@@ -1013,16 +1150,12 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "true",
 	},
 	{
-		.key = "net.bt.name",
-		.value = "Android",
-	},
-	{
-		.key = "net.change",
-		.value = "net.lte.ims.data.enabled",
+		.key = "media.recorder.show_manufacturer_and_model",
+		.value = "true",
 	},
 	{
-		.key = "net.hostname",
-		.value = "android-150cf50556084249",
+		.key = "net.bt.name",
+		.value = "Android",
 	},
 	{
 		.key = "net.lte.ims.data.enabled",
@@ -1077,6 +1210,10 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "true",
 	},
 	{
+		.key = "persist.media.treble_omx",
+		.value = "false",
+	},
+	{
 		.key = "persist.qcril.disable_retry",
 		.value = "true",
 	},
@@ -1202,11 +1339,11 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "persist.sys.usb.config",
-		.value = "mtp,adb",
+		.value = "adb",
 	},
 	{
 		.key = "persist.sys.webview.vmsize",
-		.value = "121768048",
+		.value = "112887376",
 	},
 	{
 		.key = "pm.dexopt.ab-ota",
@@ -1218,31 +1355,15 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "pm.dexopt.boot",
-		.value = "verify-profile",
-	},
-	{
-		.key = "pm.dexopt.core-app",
-		.value = "speed",
+		.value = "verify",
 	},
 	{
 		.key = "pm.dexopt.first-boot",
-		.value = "interpret-only",
-	},
-	{
-		.key = "pm.dexopt.forced-dexopt",
-		.value = "speed",
+		.value = "quicken",
 	},
 	{
 		.key = "pm.dexopt.install",
-		.value = "interpret-only",
-	},
-	{
-		.key = "pm.dexopt.nsys-library",
-		.value = "speed",
-	},
-	{
-		.key = "pm.dexopt.shared-apk",
-		.value = "speed",
+		.value = "quicken",
 	},
 	{
 		.key = "qcom.bluetooth.soc",
@@ -1250,7 +1371,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ril.ecclist",
-		.value = "911,*911,#911,112",
+		.value = "911,*911,#911,112,000,08,110,999,118,119,111,113,117,122,125",
 	},
 	{
 		.key = "ril.nosim.ecc_list_1",
@@ -1302,11 +1423,11 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.boot.bootloader",
-		.value = "BHZ11h",
+		.value = "BHZ21c",
 	},
 	{
 		.key = "ro.boot.bootreason",
-		.value = "reboot",
+		.value = "oem_powerkey",
 	},
 	{
 		.key = "ro.boot.dlcomplete",
@@ -1334,7 +1455,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.boot.serialno",
-		.value = "0205192c2a7bb0e5",
+		.value = "0105b6567ac4ced5",
 	},
 	{
 		.key = "ro.boot.verifiedbootstate",
@@ -1350,59 +1471,55 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.bootimage.build.date",
-		.value = "Tue Nov 1 18:22:15 UTC 2016",
+		.value = "Mon Aug 28 18:57:48 UTC 2017",
 	},
 	{
 		.key = "ro.bootimage.build.date.utc",
-		.value = "1478024535",
+		.value = "1503946668",
 	},
 	{
 		.key = "ro.bootimage.build.fingerprint",
-		.value = "google/bullhead/bullhead:7.1.1/NMF26F/3425388:user/release-keys",
+		.value = "google/bullhead/bullhead:8.0.0/OPR4.170623.009/4302492:user/release-keys",
 	},
 	{
 		.key = "ro.bootloader",
-		.value = "BHZ11h",
+		.value = "BHZ21c",
 	},
 	{
 		.key = "ro.bootmode",
 		.value = "unknown",
 	},
 	{
-		.key = "ro.bt.bdaddr_path",
-		.value = "/persist/bdaddr.txt",
-	},
-	{
 		.key = "ro.build.characteristics",
 		.value = "nosdcard",
 	},
 	{
 		.key = "ro.build.date",
-		.value = "Tue Nov  1 18:22:15 UTC 2016",
+		.value = "Mon Aug 28 18:57:48 UTC 2017",
 	},
 	{
 		.key = "ro.build.date.utc",
-		.value = "1478024535",
+		.value = "1503946668",
 	},
 	{
 		.key = "ro.build.description",
-		.value = "bullhead-user 7.1.1 NMF26F 3425388 release-keys",
+		.value = "bullhead-user 8.0.0 OPR4.170623.009 4302492 release-keys",
 	},
 	{
 		.key = "ro.build.display.id",
-		.value = "NMF26F",
+		.value = "OPR4.170623.009",
 	},
 	{
 		.key = "ro.build.expect.baseband",
-		.value = "M8994F-2.6.36.2.20",
+		.value = "M8994F-2.6.39.3.03",
 	},
 	{
 		.key = "ro.build.expect.bootloader",
-		.value = "BHZ11h",
+		.value = "BHZ21c",
 	},
 	{
 		.key = "ro.build.fingerprint",
-		.value = "google/bullhead/bullhead:7.1.1/NMF26F/3425388:user/release-keys",
+		.value = "google/bullhead/bullhead:8.0.0/OPR4.170623.009/4302492:user/release-keys",
 	},
 	{
 		.key = "ro.build.flavor",
@@ -1410,11 +1527,11 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.build.host",
-		.value = "vpec15.mtv.corp.google.com",
+		.value = "wpiu13.hot.corp.google.com",
 	},
 	{
 		.key = "ro.build.id",
-		.value = "NMF26F",
+		.value = "OPR4.170623.009",
 	},
 	{
 		.key = "ro.build.product",
@@ -1446,7 +1563,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.build.version.incremental",
-		.value = "3425388",
+		.value = "4302492",
 	},
 	{
 		.key = "ro.build.version.preview_sdk",
@@ -1454,15 +1571,15 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.build.version.release",
-		.value = "7.1.1",
+		.value = "8.0.0",
 	},
 	{
 		.key = "ro.build.version.sdk",
-		.value = "25",
+		.value = "26",
 	},
 	{
 		.key = "ro.build.version.security_patch",
-		.value = "2016-12-05",
+		.value = "2017-10-05",
 	},
 	{
 		.key = "ro.camera.notify_nfc",
@@ -1481,10 +1598,6 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "false",
 	},
 	{
-		.key = "ro.com.android.wifi-watchlist",
-		.value = "GoogleGuest",
-	},
-	{
 		.key = "ro.com.google.clientidbase",
 		.value = "android-google",
 	},
@@ -1505,6 +1618,10 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "7",
 	},
 	{
+		.key = "ro.control_privapp_permissions",
+		.value = "enforce",
+	},
+	{
 		.key = "ro.crypto.fs_crypto_blkdev",
 		.value = "/dev/block/dm-2",
 	},
@@ -1525,12 +1642,16 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "0",
 	},
 	{
+		.key = "ro.device_owner",
+		.value = "false",
+	},
+	{
 		.key = "ro.error.receiver.system.apps",
 		.value = "com.google.android.gms",
 	},
 	{
 		.key = "ro.expect.recovery_id",
-		.value = "0xc3fa4d20943e3f2c988a1ee26f54d3982287ac4b000000000000000000000000",
+		.value = "0xd24d616d72d2e4db78f2d45a9fddcdb17d50e3fd000000000000000000000000",
 	},
 	{
 		.key = "ro.facelock.black_timeout",
@@ -1605,6 +1726,10 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "384000",
 	},
 	{
+		.key = "ro.min_freq_4",
+		.value = "384000",
+	},
+	{
 		.key = "ro.oem_unlock_supported",
 		.value = "1",
 	},
@@ -1641,6 +1766,10 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "bullhead",
 	},
 	{
+		.key = "ro.product.first_api_level",
+		.value = "23",
+	},
+	{
 		.key = "ro.product.locale",
 		.value = "en-US",
 	},
@@ -1657,12 +1786,16 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "bullhead",
 	},
 	{
+		.key = "ro.property_service.version",
+		.value = "2",
+	},
+	{
 		.key = "ro.qc.sdk.audio.fluencetype",
 		.value = "fluencepro",
 	},
 	{
 		.key = "ro.recovery_id",
-		.value = "0x9bab4bea29fb8f790b42f67336d3b61775dacd51000000000000000000000000",
+		.value = "0x952a5168adfd47b78c6ee8f3ea86ebba59d843cb000000000000000000000000",
 	},
 	{
 		.key = "ro.retaildemo.video_path",
@@ -1686,7 +1819,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.serialno",
-		.value = "0205192c2a7bb0e5",
+		.value = "0105b6567ac4ced5",
 	},
 	{
 		.key = "ro.setupwizard.enterprise_mode",
@@ -1713,6 +1846,10 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "22",
 	},
 	{
+		.key = "ro.treble.enabled",
+		.value = "false",
+	},
+	{
 		.key = "ro.url.legal",
 		.value = "http://www.google.com/intl/%s/mobile/android/basic/phone-legal.html",
 	},
@@ -1722,15 +1859,15 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.vendor.build.date",
-		.value = "Tue Nov 1 18:22:15 UTC 2016",
+		.value = "Mon Aug 28 18:57:48 UTC 2017",
 	},
 	{
 		.key = "ro.vendor.build.date.utc",
-		.value = "1478024535",
+		.value = "1503946668",
 	},
 	{
 		.key = "ro.vendor.build.fingerprint",
-		.value = "google/bullhead/bullhead:7.1.1/NMF26F/3425388:user/release-keys",
+		.value = "google/bullhead/bullhead:8.0.0/OPR4.170623.009/4302492:user/release-keys",
 	},
 	{
 		.key = "ro.vendor.extension_library",
@@ -1749,40 +1886,76 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "1",
 	},
 	{
-		.key = "selinux.reload_policy",
+		.key = "service.bootanim.exit",
 		.value = "1",
 	},
 	{
-		.key = "service.bootanim.exit",
-		.value = "1",
+		.key = "service.sf.present_timestamp",
+		.value = "0",
 	},
 	{
 		.key = "sys.boot_completed",
 		.value = "1",
 	},
 	{
+		.key = "sys.logbootcomplete",
+		.value = "1",
+	},
+	{
 		.key = "sys.oem_unlock_allowed",
 		.value = "0",
 	},
 	{
+		.key = "sys.qcom.devup",
+		.value = "1",
+	},
+	{
+		.key = "sys.rescue_boot_count",
+		.value = "1",
+	},
+	{
 		.key = "sys.sysctl.extra_free_kbytes",
 		.value = "24300",
 	},
 	{
+		.key = "sys.sysctl.tcp_def_init_rwnd",
+		.value = "60",
+	},
+	{
 		.key = "sys.usb.config",
-		.value = "mtp,adb",
+		.value = "adb",
 	},
 	{
 		.key = "sys.usb.configfs",
 		.value = "0",
 	},
 	{
+		.key = "sys.usb.controller",
+		.value = "f9200000.dwc3",
+	},
+	{
+		.key = "sys.usb.ffs.max_read",
+		.value = "262144",
+	},
+	{
+		.key = "sys.usb.ffs.max_write",
+		.value = "262144",
+	},
+	{
 		.key = "sys.usb.ffs.ready",
 		.value = "1",
 	},
 	{
+		.key = "sys.usb.mtp.device_type",
+		.value = "3",
+	},
+	{
 		.key = "sys.usb.state",
-		.value = "mtp,adb",
+		.value = "adb",
+	},
+	{
+		.key = "sys.wifitracing.started",
+		.value = "1",
 	},
 	{
 		.key = "telephony.lteOnCdmaDevice",
@@ -1816,10 +1989,6 @@ struct cpuinfo_mock_property properties[] = {
 		.key = "wifi.supplicant_scan_interval",
 		.value = "15",
 	},
-	{
-		.key = "wlan.driver.status",
-		.value = "ok",
-	},
 	{ NULL },
 };
 #endif /* __ANDROID__ */