commit c62e31242de918ac2910e1536e37490c45a51171
author Martin Stjernholm <mast@google.com> Fri Mar 22 15:35:09 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 22 15:35:09 2019 +0000
tree c15148ca8dd74aa885f706a59aa1eb6a0caa023b
parent 9da9c32e80fa3e819ab3490b668bb339ed379588
parent d185bb29ceff792229e92c0584b6776a9298b2ef

Merge "Exclude libdexfile_external.so to fix aosp_marlin-userdebug builds."

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 2ef24af..1c53459 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2160,6 +2160,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
@@ -2169,7 +2170,6 @@
 APEX_MODULE_LIBS= \
   libadbconnection.so \
   libandroidicu.so \
-  libdexfile_external.so \
   libdt_fd_forward.so \
   libdt_socket.so \
   libjavacore.so \