From 08b5aa0311f023b6b273cb7ae4ec82c17050290d Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Wed, 1 Jul 2020 16:34:51 +0000
Subject: [PATCH 01/26] Version bump to RQ1A.200701.001 [core/build_id.mk]

Change-Id: I75aa69474990f5906453b9790e8dd801c40c06af
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 11f4a8066..3532ccfdc 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=RVC
+BUILD_ID=RQ1A.200701.001

From 3ac341d9c8d83183c4fc19ed87c88d5f54a979df Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Tue, 28 Jul 2020 17:27:47 +0000
Subject: [PATCH 02/26] Version bump to RQ1A.200728.002 [core/build_id.mk]

Change-Id: I87aef567020d5c816bc0d6a5eed8f1b8f1bad49c
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index bd6e5b35d..9d8a09c52 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=RQ1A.200728.001
+BUILD_ID=RQ1A.200728.002

From ec1fa31820e722ebeb05ef6b32a026377beb9b5b Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Fri, 11 Sep 2020 03:35:29 +0000
Subject: [PATCH 03/26] Version bump to RQ1A.200911.002 [core/build_id.mk]

Change-Id: Ia1c5b5401b4135bcd5c494bfce878262f4c3ec6a
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 8e77f3b09..d1b2282fc 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=RQ1A.200911.001
+BUILD_ID=RQ1A.200911.002

From 0e74a36c55fc069b0bf6a38ad2048f3e3b309486 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Thu, 17 Sep 2020 00:45:40 +0000
Subject: [PATCH 04/26] Version bump to RQ1A.200917.002 [core/build_id.mk]

Change-Id: I8a785210a2b3ed019ba55e5a5651d13e2cd125f5
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index e73f15275..933a0df0b 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=RQ1A.200917.001
+BUILD_ID=RQ1A.200917.002

From aceafb8de251b02b5f2c41bf9615a8d038aa5f59 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Fri, 25 Sep 2020 21:01:45 +0000
Subject: [PATCH 05/26] Version bump to RQ1A.200925.002 [core/build_id.mk]

Change-Id: Ie88daccb2193553c8571e9cec8b15bbdc7e06b0c
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 7fc683c34..ee8abd60b 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=RQ1A.200925.001
+BUILD_ID=RQ1A.200925.002

From 6d6590b55faa24d9d9dcb3d4730aa643d80f4504 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Mon, 5 Oct 2020 23:36:17 +0000
Subject: [PATCH 06/26] Version bump to RQ1A.201004.002 [core/build_id.mk]

Change-Id: I168d3d782a3e3f079e86e5ee1bf37ab6f8be3170
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index dd079921b..d53016439 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=RQ1A.201004.001
+BUILD_ID=RQ1A.201004.002

From 64482e35b474a6df8a25e3beec73761c4edf2086 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Tue, 6 Oct 2020 23:41:49 +0000
Subject: [PATCH 07/26] Version bump to RQ1A.201004.003 [core/build_id.mk]

Change-Id: I5f01b8604ec60143eeffa9b49efa7d5f4851dfb8
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index d53016439..18d6117e4 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=RQ1A.201004.002
+BUILD_ID=RQ1A.201004.003

From cfb0d67fc40067e823f3d24a6e5c61e7f9d9cf32 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Thu, 8 Oct 2020 23:12:54 +0000
Subject: [PATCH 08/26] Version bump to RQ1A.201004.004 [core/build_id.mk]

Change-Id: I824fdbae50cbd8a14f5b33abbafb44311814fdc3
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 18d6117e4..44b21b9a4 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=RQ1A.201004.003
+BUILD_ID=RQ1A.201004.004

From aa40fe7b426997fb6636ae8bb637a73a726e01b7 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Sat, 10 Oct 2020 00:32:21 +0000
Subject: [PATCH 09/26] Version bump to RQ1A.201004.005 [core/build_id.mk]

Change-Id: I18fdd1e80cb3b532498f9b19b65ef8ca100d7785
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 44b21b9a4..23e0f7def 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=RQ1A.201004.004
+BUILD_ID=RQ1A.201004.005

From 827ac3ed0282be4eb6e95e2bf136e0b643ad0868 Mon Sep 17 00:00:00 2001
From: Paul Scovanner <pscovanner@google.com>
Date: Mon, 12 Oct 2020 22:01:06 +0000
Subject: [PATCH 10/26] Update Security String to 2020-12-05

Bug: 170492812
Change-Id: I61eac7915ab4b23227c3263d3f33a0f71dc3a107
(cherry picked from commit 29d48ffac57b569a9b5822b59a906f776136deb0)
---
 core/version_defaults.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index d3ad4f4b0..30b7da656 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -240,7 +240,7 @@ ifndef PLATFORM_SECURITY_PATCH
     #  It must be of the form "YYYY-MM-DD" on production devices.
     #  It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
     #  If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
-      PLATFORM_SECURITY_PATCH := 2020-11-05
+      PLATFORM_SECURITY_PATCH := 2020-12-05
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH
 

From 841994abebd36897b5e3341d0509aa4f6a9cc165 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Wed, 14 Oct 2020 23:13:16 +0000
Subject: [PATCH 11/26] Version bump to RQ1A.201205.002 [core/build_id.mk]

Change-Id: I5441e7cd87620dcfa515348cbc9cd126d9ff0ec8
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 28faa2f6d..212802656 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=RQ1A.201205.001
+BUILD_ID=RQ1A.201205.002

From 6deca99cc56cbd8e3b644e52be776667711f45f6 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Thu, 15 Oct 2020 01:57:32 +0000
Subject: [PATCH 12/26] Version bump to RQ1A.201205.003 [core/build_id.mk]

Change-Id: Ie705bbc85ff0136821206a44daf70560e447b965
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 212802656..2628228fa 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=RQ1A.201205.002
+BUILD_ID=RQ1A.201205.003

From 55ddfd84d36764c26f343ac1fa2f603f9f26055b Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Mon, 19 Oct 2020 22:27:11 +0000
Subject: [PATCH 13/26] Version bump to RQ1A.201205.004 [core/build_id.mk]

Change-Id: I95da9acd43b6ed9c2dbdad7a29e7b7477df409d0
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 2628228fa..236d6e639 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=RQ1A.201205.003
+BUILD_ID=RQ1A.201205.004

From 5d94291a874eb8d8f68defada1bf40cbfad68a54 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Wed, 21 Oct 2020 19:05:40 +0000
Subject: [PATCH 14/26] Version bump to RQ1A.201205.005 [core/build_id.mk]

Change-Id: I2d2fd5069a2759b74ef32bec14f8d2b9213bbe12
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 236d6e639..c7ceef31a 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=RQ1A.201205.004
+BUILD_ID=RQ1A.201205.005

From 26eaef4b89b757f148bff03de699c9ef5e26b231 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Thu, 22 Oct 2020 21:15:36 +0000
Subject: [PATCH 15/26] Version bump to RQ1A.201205.006 [core/build_id.mk]

Change-Id: I0e3913927f7487534b724ddf028d3f83b9028f5d
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index c7ceef31a..08b38d454 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=RQ1A.201205.005
+BUILD_ID=RQ1A.201205.006

From 22c21c1d7db2201696a5146a862d38d8b020809e Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Fri, 30 Oct 2020 01:46:55 +0000
Subject: [PATCH 16/26] Version bump to RQ1A.201205.007 [core/build_id.mk]

Change-Id: I1e30f275e0165ababa3db85859f3e1c8700d689e
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 08b38d454..4189974b7 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=RQ1A.201205.006
+BUILD_ID=RQ1A.201205.007

From 3f95724bcbe875846edc1c0b1575c71c1c2acfd5 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Sat, 31 Oct 2020 00:25:57 +0000
Subject: [PATCH 17/26] Version bump to RQ1A.201205.008 [core/build_id.mk]

Change-Id: I6c6daca45f2fde2eb8fcb7718dc98df23e3ee793
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 4189974b7..25c171e2a 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=RQ1A.201205.007
+BUILD_ID=RQ1A.201205.008

From 3175c171305d5ec1d97f4c20e5ba22456ae6dc8c Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Wed, 4 Nov 2020 04:05:04 +0000
Subject: [PATCH 18/26] Version bump to RQ1A.201205.009 [core/build_id.mk]

Change-Id: Ie13afe8c6cd67eeb769b7292d13c12e7ded2a2ba
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 25c171e2a..f68c5fb12 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=RQ1A.201205.008
+BUILD_ID=RQ1A.201205.009

From a95305b81fed00f7d352159a3af1170b4fa660de Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Thu, 5 Nov 2020 04:08:24 +0000
Subject: [PATCH 19/26] Version bump to RQ1A.201205.010 [core/build_id.mk]

Change-Id: If81905c947ee0cf2ba991830b6559ed553a18d68
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index f68c5fb12..2eed08faa 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=RQ1A.201205.009
+BUILD_ID=RQ1A.201205.010

From 642ed5e4ffa9fe6bec9e81b1bad8aa33581ea6e0 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Wed, 11 Nov 2020 19:31:50 +0000
Subject: [PATCH 20/26] Version bump to RQ1A.201205.011 [core/build_id.mk]

Change-Id: If88829e911f694205051cf617d8cc707e59eae55
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 2eed08faa..72fe73eb0 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=RQ1A.201205.010
+BUILD_ID=RQ1A.201205.011

From 34d6aff04e5dcf386a0974bd03b527c64aa8bb55 Mon Sep 17 00:00:00 2001
From: Paul Scovanner <pscovanner@google.com>
Date: Tue, 17 Nov 2020 23:14:18 +0000
Subject: [PATCH 21/26] Update Security String to 2021-01-05

Bug: 173545603
Change-Id: I273073a04d6981c5a58b3aebdf13249fdb46586e
(cherry picked from commit 643b2649404fd9c0f83cd42ae1d0d16278df8740)
---
 core/version_defaults.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 30b7da656..6ac90d8d3 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -240,7 +240,7 @@ ifndef PLATFORM_SECURITY_PATCH
     #  It must be of the form "YYYY-MM-DD" on production devices.
     #  It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
     #  If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
-      PLATFORM_SECURITY_PATCH := 2020-12-05
+      PLATFORM_SECURITY_PATCH := 2021-01-05
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH
 

From 7c553a1c740db41e1ef664cde18f541c6950f65e Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Fri, 20 Nov 2020 01:21:52 +0000
Subject: [PATCH 22/26] Version bump to RQ1A.210105.002 [core/build_id.mk]

Change-Id: I0e3a13c366d2af5e823fd0cc2ec8cc6170a3bb29
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 24e3ca8de..a31db8792 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=RQ1A.210105.001
+BUILD_ID=RQ1A.210105.002

From e9f73e3bd0c08cc75c281e798b44183b58b7958a Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Tue, 1 Dec 2020 23:58:00 +0000
Subject: [PATCH 23/26] Version bump to RQ1A.210105.003 [core/build_id.mk]

Change-Id: If4e38ab920685601f5371adf686cf05630232735
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index a31db8792..938cdeff3 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=RQ1A.210105.002
+BUILD_ID=RQ1A.210105.003

From 42ea8098ccd4cff1dcfdebd9248dcfde06cf79ff Mon Sep 17 00:00:00 2001
From: Pavel Dubrova <pashadubrova@gmail.com>
Date: Fri, 25 Oct 2019 13:57:22 +0300
Subject: [PATCH 24/26] envsetup.sh: Add functionality to generate vendor HAL
 make files

Create hidl-gen before actual make. The script also has an
optional --check to see if hidl-gen source or vendor interfaces
have changed. If there are no changes, skip the unnecessary
hidl-gen ALLOW_MISSING_DEPENDENCIES compilation.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
---
 envsetup.sh | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/envsetup.sh b/envsetup.sh
index 793f4b6cf..cc516e9a1 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1510,6 +1510,29 @@ function mmma()
 
 function make()
 {
+    if [ -f $ANDROID_BUILD_TOP/$EL_BUILDTOOLS_DIR/build/update-vendor-hal-makefiles.sh ]; then
+        vendor_hal_script=$ANDROID_BUILD_TOP/$EL_BUILDTOOLS_DIR/build/update-vendor-hal-makefiles.sh
+        source $vendor_hal_script --check
+        regen_needed=$?
+
+        if [ $regen_needed -eq 1 ]; then
+            _wrap_build $(get_make_command hidl-gen) hidl-gen ALLOW_MISSING_DEPENDENCIES=true
+            RET=$?
+            if [ $RET -ne 0 ]; then
+                echo -n "${color_failed}#### hidl-gen compilation failed, check above errors"
+                echo " ####${color_reset}"
+                return $RET
+            fi
+            source $vendor_hal_script
+            RET=$?
+            if [ $RET -ne 0 ]; then
+                echo -n "${color_failed}#### HAL file .bp generation failed dure to incpomaptible HAL files , please check above error log"
+                echo " ####${color_reset}"
+                return $RET
+            fi
+        fi
+    fi
+
     _wrap_build $(get_make_command "$@") "$@"
 }
 

From fae553212b70ef295a6a5a2137d0c398868e7724 Mon Sep 17 00:00:00 2001
From: Pavel Dubrova <pashadubrova@gmail.com>
Date: Tue, 29 Dec 2020 10:45:22 +0200
Subject: [PATCH 25/26] product: full_base: Inherit ExplosiveLobster makefie

Inherit ExplosiveLobster makefie (vendor/el/el.mk) if exists.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
---
 target/product/full_base.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/target/product/full_base.mk b/target/product/full_base.mk
index ffd3cde11..69a92bc6c 100644
--- a/target/product/full_base.mk
+++ b/target/product/full_base.mk
@@ -61,3 +61,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_no_telephony.mk)
 
 # Add adb keys to debuggable AOSP builds (if they exist)
 $(call inherit-product-if-exists, vendor/google/security/adb/vendor_key.mk)
+
+# Get Explosive Lobster additional settings/packages
+$(call inherit-product-if-exists, vendor/el/el.mk)

From a0060f0436727fec6e096364774022cd33c4f2b6 Mon Sep 17 00:00:00 2001
From: Daniele Laudani <danielelaudani@protonmail.com>
Date: Wed, 3 Feb 2021 09:05:25 +0100
Subject: [PATCH 26/26] add Seedvault as backup provider

---
 target/product/media_system.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/target/product/media_system.mk b/target/product/media_system.mk
index 4d507b5fb..2c0553869 100644
--- a/target/product/media_system.mk
+++ b/target/product/media_system.mk
@@ -37,6 +37,8 @@ PRODUCT_PACKAGES += \
     requestsync \
     StatementService \
 
+PRODUCT_PACKAGES += Seedvault
+
 PRODUCT_HOST_PACKAGES += \
     fsck.f2fs \