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

am: c62e31242d

Change-Id: I01446f20619e93fd407a9085dba0c3511e15ca13
This commit is contained in:
Martin Stjernholm
2019-03-22 08:43:22 -07:00
committed by android-build-merger

View File

@@ -2160,6 +2160,7 @@ endif
# libartbase.so # libartbase.so
# libartpalette.so # libartpalette.so
# libdexfile.so # libdexfile.so
# libdexfile_external.so - aosp_marlin-userdebug gets this in a vndk-sp-Q subdirectory.
# libicui18n.so # libicui18n.so
# libicuuc.so # libicuuc.so
# libnativehelper.so - cf_x86_phone-userdebug builds get this in system/lib/arm # libnativehelper.so - cf_x86_phone-userdebug builds get this in system/lib/arm
@@ -2169,7 +2170,6 @@ endif
APEX_MODULE_LIBS= \ APEX_MODULE_LIBS= \
libadbconnection.so \ libadbconnection.so \
libandroidicu.so \ libandroidicu.so \
libdexfile_external.so \
libdt_fd_forward.so \ libdt_fd_forward.so \
libdt_socket.so \ libdt_socket.so \
libjavacore.so \ libjavacore.so \