Update to latest release
diff --git a/patches/platform_build/0001-Add-PRODUCT_SYSTEM_DEFAULT_PROPERTIES.patch b/patches/platform_build/0001-Add-PRODUCT_SYSTEM_DEFAULT_PROPERTIES.patch
index 893c807..acf8134 100644
--- a/patches/platform_build/0001-Add-PRODUCT_SYSTEM_DEFAULT_PROPERTIES.patch
+++ b/patches/platform_build/0001-Add-PRODUCT_SYSTEM_DEFAULT_PROPERTIES.patch
@@ -1,7 +1,7 @@
-From cd16437f867940eeeea039e40e4cb926b493a48e Mon Sep 17 00:00:00 2001
+From e0717a868052ab839ad0b589ca7cb869df5ad43f Mon Sep 17 00:00:00 2001
From: Jaekyun Seok <jaekyun@google.com>
Date: Fri, 3 Nov 2017 15:18:55 +0900
-Subject: [PATCH 1/3] Add PRODUCT_SYSTEM_DEFAULT_PROPERTIES
+Subject: [PATCH 1/4] Add PRODUCT_SYSTEM_DEFAULT_PROPERTIES
PRODUCT_SYSTEM_DEFAULT_PROPERTIES will be used to define system default
properties which should be installed in system partition.
@@ -20,7 +20,7 @@
4 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/core/Makefile b/core/Makefile
-index 618e98317..77a817cd5 100644
+index 618e983..77a817c 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -90,7 +90,8 @@ INSTALLED_DEFAULT_PROP_TARGET := $(TARGET_ROOT_OUT)/default.prop
@@ -34,7 +34,7 @@
FINAL_DEFAULT_PROPERTIES += \
$(call collapse-pairs, $(PRODUCT_DEFAULT_PROPERTY_OVERRIDES))
diff --git a/core/product-graph.mk b/core/product-graph.mk
-index 36e903723..dc9a29646 100644
+index 36e9037..dc9a296 100644
--- a/core/product-graph.mk
+++ b/core/product-graph.mk
@@ -103,6 +103,7 @@ $(OUT_DIR)/products/$(strip $(1)).txt: $(this_makefile)
@@ -46,7 +46,7 @@
$(hide) echo 'PRODUCT_COPY_FILES=$$(PRODUCTS.$(strip $(1)).PRODUCT_COPY_FILES)' >> $$@
$(hide) echo 'PRODUCT_OTA_PUBLIC_KEYS=$$(PRODUCTS.$(strip $(1)).PRODUCT_OTA_PUBLIC_KEYS)' >> $$@
diff --git a/core/product.mk b/core/product.mk
-index 4682dac99..ea6cd30fa 100644
+index 4682dac..ea6cd30 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -112,6 +112,7 @@ _product_var_list := \
@@ -58,7 +58,7 @@
PRODUCT_SYSTEM_SERVER_APPS \
PRODUCT_SYSTEM_SERVER_JARS \
diff --git a/core/product_config.mk b/core/product_config.mk
-index f7ae834fb..330497f5b 100644
+index f7ae834..330497f 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -359,6 +359,13 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES := \
@@ -76,5 +76,5 @@
PRODUCT_PACKAGE_OVERLAYS := \
$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGE_OVERLAYS))
--
-2.15.1
+2.7.4
diff --git a/patches/platform_build/0002-Move-ART-default-properties-into-system-partition.patch b/patches/platform_build/0002-Move-ART-default-properties-into-system-partition.patch
index 5695ad4..ec8d0da 100644
--- a/patches/platform_build/0002-Move-ART-default-properties-into-system-partition.patch
+++ b/patches/platform_build/0002-Move-ART-default-properties-into-system-partition.patch
@@ -1,7 +1,7 @@
-From 84e5d0e45c211c4e5e22acfea523ede244d34911 Mon Sep 17 00:00:00 2001
+From edcb0cb74c66637f34746dbcc7f35d6c268dc56e Mon Sep 17 00:00:00 2001
From: Jaekyun Seok <jaekyun@google.com>
Date: Fri, 3 Nov 2017 15:33:10 +0900
-Subject: [PATCH 2/3] Move ART default properties into system partition
+Subject: [PATCH 2/4] Move ART default properties into system partition
Bug: 64661857
Bug: 68755013
@@ -15,7 +15,7 @@
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk
-index 96160367b..15cb221b6 100644
+index 9616036..15cb221 100644
--- a/core/dex_preopt_libart.mk
+++ b/core/dex_preopt_libart.mk
@@ -30,7 +30,9 @@ DIRTY_IMAGE_OBJECTS := $(call word-colon,1,$(firstword \
@@ -30,7 +30,7 @@
DEX2OAT_IMAGE_XMS := $(call get-product-default-property,dalvik.vm.image-dex2oat-Xms)
diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
-index 8aedee79c..f1b8f4596 100644
+index 8aedee7..f1b8f45 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -56,7 +56,7 @@ PRODUCT_PACKAGES += art-tools
@@ -63,5 +63,5 @@
pm.dexopt.bg-dexopt=speed-profile \
pm.dexopt.ab-ota=speed-profile \
--
-2.15.1
+2.7.4
diff --git a/patches/platform_build/0003-Set-ro.build.fingerprint-in-system-etc-prop.default.patch b/patches/platform_build/0003-Set-ro.build.fingerprint-in-system-etc-prop.default.patch
index 090ac53..a780cf8 100644
--- a/patches/platform_build/0003-Set-ro.build.fingerprint-in-system-etc-prop.default.patch
+++ b/patches/platform_build/0003-Set-ro.build.fingerprint-in-system-etc-prop.default.patch
@@ -1,14 +1,14 @@
-From 98a31a76008d682563273b8196668b57c1b6ff14 Mon Sep 17 00:00:00 2001
+From ed63e5f22b143b683b0d96393d4758f61bfec9ef Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 5 Mar 2018 22:27:50 +0100
-Subject: [PATCH 3/3] Set ro.build.fingerprint in system/etc/prop.default
+Subject: [PATCH 3/4] Set ro.build.fingerprint in system/etc/prop.default
---
core/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/core/Makefile b/core/Makefile
-index 77a817cd5..e0f0e9145 100644
+index 77a817c..e0f0e91 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -116,6 +116,7 @@ $(INSTALLED_DEFAULT_PROP_TARGET): $(intermediate_system_build_prop)
@@ -20,5 +20,5 @@
ifdef property_overrides_split_enabled
$(hide) mkdir -p $(TARGET_ROOT_OUT)
--
-2.15.1
+2.7.4
diff --git a/patches/platform_build/0004-Revert-Remove-root-folder-bt_firmware-in-GSI.patch b/patches/platform_build/0004-Revert-Remove-root-folder-bt_firmware-in-GSI.patch
new file mode 100644
index 0000000..79dd57e
--- /dev/null
+++ b/patches/platform_build/0004-Revert-Remove-root-folder-bt_firmware-in-GSI.patch
@@ -0,0 +1,53 @@
+From b1fd47b99f06d78d728ace3c57d5c9bade5e4831 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Tue, 27 Mar 2018 23:26:49 +0200
+Subject: [PATCH 4/4] Revert "Remove root folder bt_firmware in GSI"
+
+This reverts commit 292b8433cb48ef4ceb2330e57e11b8f644d9d1ee.
+
+Essential 8.1 firmware requires this
+---
+ target/board/generic_arm64_ab/BoardConfig.mk | 2 +-
+ target/board/generic_arm64_ab/sepolicy/file.te | 1 +
+ target/board/generic_arm64_ab/sepolicy/file_contexts | 1 +
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/target/board/generic_arm64_ab/BoardConfig.mk b/target/board/generic_arm64_ab/BoardConfig.mk
+index 6744289..d7b9979 100644
+--- a/target/board/generic_arm64_ab/BoardConfig.mk
++++ b/target/board/generic_arm64_ab/BoardConfig.mk
+@@ -33,7 +33,7 @@ TARGET_NO_RECOVERY := true
+ BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
+
+ # TODO(jiyong) These might be SoC specific.
+-BOARD_ROOT_EXTRA_FOLDERS += firmware firmware/radio persist
++BOARD_ROOT_EXTRA_FOLDERS += bt_firmware firmware firmware/radio persist
+ BOARD_ROOT_EXTRA_SYMLINKS := /vendor/lib/dsp:/dsp
+
+ # TODO(b/36764215): remove this setting when the generic system image
+diff --git a/target/board/generic_arm64_ab/sepolicy/file.te b/target/board/generic_arm64_ab/sepolicy/file.te
+index 7adfdfa..4645533 100644
+--- a/target/board/generic_arm64_ab/sepolicy/file.te
++++ b/target/board/generic_arm64_ab/sepolicy/file.te
+@@ -1,5 +1,6 @@
+ # TODO(b/36764215): remove this file when the generic system image
+ # no longer has these directories
++type bt_firmware_file, file_type;
+ type persist_file, file_type;
+
+ # Default type for anything under /firmware.
+diff --git a/target/board/generic_arm64_ab/sepolicy/file_contexts b/target/board/generic_arm64_ab/sepolicy/file_contexts
+index 0a80559..92a4ff8 100644
+--- a/target/board/generic_arm64_ab/sepolicy/file_contexts
++++ b/target/board/generic_arm64_ab/sepolicy/file_contexts
+@@ -2,6 +2,7 @@
+ # no longer has these directories. They are specific to QCOM.
+
+ # /
++/bt_firmware(/.*)? u:object_r:bt_firmware_file:s0
+ /tombstones u:object_r:rootfs:s0
+ /dsp u:object_r:rootfs:s0
+
+--
+2.7.4
+