commit af369dd239fbf8bd8e55aac86aea1abb7b448d5f
author rohan <purohit.rohan@gmail.com> Sat Jun 06 23:58:31 2020 -0400
committer rohan <purohit.rohan@gmail.com> Sat Jun 06 23:58:38 2020 -0400
tree 6f83c9b122821b11499edf2fcd5d71ec3972e5f7
parent c25cef221d8eaa79038df1dec02f795b60d9e1cd
parent 209a1118a4fc8a30773bb3bb5c319a5956b0d7f9

Merge 'lineage-17.1' into q

Change-Id: I692a4f8c9bb513574bd179c0f1d8cd1deebfe41d

Android.bp

diff --git a/Android.bp b/Android.bp
index f3c2557..6cf0b36 100644
--- a/Android.bp
+++ b/Android.bp
@@ -151,7 +151,7 @@
         debuggable: {
             cppflags: ["-D__ANDROID_DEBUGGABLE__"],
         },
-        lineage: {
+        bliss: {
             supports_hw_fde: {
                 cflags: ["-DCONFIG_HW_DISK_ENCRYPTION"],
                 header_libs: ["libcryptfs_hw_headers"],
@@ -187,7 +187,7 @@
                 "libarcobbvolume",
             ],
         },
-        lineage: {
+        bliss: {
             supports_hw_fde: {
                 shared_libs: ["libcryptfs_hw"],
             },