Snap for 9957928 from a3719f586d to udc-release

Change-Id: Ic70d14781837eedc417ed776a038677f67135f37

device.mk

@@ -1176,3 +1176,6 @@ PRODUCT_VENDOR_PROPERTIES += ro.crypto.metadata_init_delete_all_keys.enabled?=tr
 
 # Hardware Info
 include hardware/google/pixel/HardwareInfo/HardwareInfo.mk
+
+# UFS: the script is used to select the corresponding firmware to run FFU.
+PRODUCT_PACKAGES += ufs_firmware_update.sh

storage/Android.bp

@@ -0,0 +1,27 @@
+//
+// Copyright (C) 2017 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.
+// 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.
+
+package {
+    default_applicable_licenses: [
+        "//device/google/gs201:device_google_gs201_license",
+    ],
+}
+
+sh_binary {
+    name: "ufs_firmware_update.sh",
+    src: "ufs_firmware_update.sh",
+    init_rc: ["storage.gs201.rc"],
+    vendor: true,
+}

storage/storage.gs201.rc

@@ -0,0 +1,7 @@
+on property:sys.boot_completed=1
+    # Copy ufs firmware to disk
+    start ufs_firmware_update
+
+service ufs_firmware_update /vendor/bin/ufs_firmware_update.sh
+    disabled
+    oneshot

storage/ufs_firmware_update.sh

@@ -0,0 +1,19 @@
+#!/vendor/bin/sh
+#
+# The script belongs to the feature of UFS FFU via OTA: go/p23-ffu-ota
+# Its purpose is to copy the corresponding firmware into partition for UFS FFU.
+
+ufs_dev="/dev/sys/block/bootdevice"
+fw_dir="/vendor/firmware"
+blk_dev="/dev/block/by-name/fips"
+
+vendor=$(cat ${ufs_dev}/vendor | tr -d "[:space:]")
+model=$(cat ${ufs_dev}/model | tr -d "[:space:]")
+rev=$(cat ${ufs_dev}/rev | tr -d "[:space:]")
+
+file=$(find ${fw_dir} -name "*${vendor}${model}${rev}*" | head -n 1)
+if [ -n "$file" ]; then
+	# The first 4KB block at fips partition has been occupied, and unused space begins from 4 KB
+	# Refer to: go/pixel-mp-ffu-ota-1p
+	dd if="$file" of=$blk_dev bs=4k seek=1
+fi

wifi/qcom/BoardConfig-wifi.mk

@@ -46,3 +46,6 @@ BOARD_HOSTAPD_CONFIG_80211W_MFP_OPTIONAL := true
 PRODUCT_COPY_FILES += \
     $(LOCAL_WIFI_PATH)/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \
     $(LOCAL_WIFI_PATH)/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf
+
+# Add BOARD_WLAN_CHIP to soong_config
+$(call soong_config_set,qcom_wifi,board_wlan_chip,wcn6740)