commit d185bb29ceff792229e92c0584b6776a9298b2ef
author Martin Stjernholm <mast@google.com> Fri Mar 22 14:24:08 2019 +0000
committer Martin Stjernholm <mast@google.com> Fri Mar 22 14:24:08 2019 +0000
tree f072e9b9007eb4f3ba60b800d17c940f51954132
parent f1e7c7159b1247ada5fa5d2aef6b6517145cdb0f

Exclude libdexfile_external.so to fix aosp_marlin-userdebug builds.

Test: m systemimage
Bug: 124293228
Change-Id: I7a4744457396084ef9fd78d9c2f1efdabe0f981d

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 7c5daee..a15e42e 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2140,6 +2140,7 @@
 #   libartbase.so
 #   libartpalette.so
 #   libdexfile.so
+#   libdexfile_external.so  - aosp_marlin-userdebug gets this in a vndk-sp-Q subdirectory.
 #   libicui18n.so
 #   libicuuc.so
 #   libnativehelper.so  - cf_x86_phone-userdebug builds get this in system/lib/arm
@@ -2149,7 +2150,6 @@
 APEX_MODULE_LIBS= \
   libadbconnection.so \
   libandroidicu.so \
-  libdexfile_external.so \
   libdt_fd_forward.so \
   libdt_socket.so \
   libjavacore.so \