commit 113b346ae0d2f4889936f73085d3c7e00181eda8
author Treehugger Robot <treehugger-gerrit@google.com> Thu Nov 25 16:31:28 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 25 16:31:28 2021 +0000
tree f450234a13552bc923730ce015308d0197d23961
parent 8429734091f47596b65c3d8f0a665e76f9b8bcad
parent 9a79ce98d7c5ebb44065767fb7c2280c523a3ead

Merge "Make verify_key easier to test"

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 9d6cc94..f125456 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -16,6 +16,9 @@
     // TODO(jiyong): make it updatable
     updatable: false,
     platform_apis: true,
+    // b/207336449: this is to turn the symlink optimization off while keeping this APEX
+    // non-updatable. Can be removed when `updatable` becomes true.
+    installable: false,
 
     system_ext_specific: true,
 

apex/product_packages.mk

diff --git a/apex/product_packages.mk b/apex/product_packages.mk
index 1a431d5..322b73e 100644
--- a/apex/product_packages.mk
+++ b/apex/product_packages.mk
@@ -25,7 +25,6 @@
 
 # TODO(b/207336449): Figure out how to get these off /system
 PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST := \
-    system/lib64/libgfxstream_backend.so \
     system/framework/oat/%@service-compos.jar@classes.odex \
     system/framework/oat/%@service-compos.jar@classes.vdex \