Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b84f1489 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Use apex_available property" am: 8029967a am: d0307617 

Change-Id: I980478ff17779ac10f1dbbce26eedb7e69b8c9d1
parents 6ae6a3e4 d0307617

core/main.mk

+0 −8
Original line number Diff line number Diff line
@@ -1118,18 +1118,10 @@ APEX_MODULE_LIBS += \ 
  libdl_android.so \

  libm.so \



# Conscrypt APEX libraries

APEX_MODULE_LIBS += \

  libjavacrypto.so \



# Android Neural Network API (NNAPI) APEX (native) libraries

APEX_MODULE_LIBS += \

  libneuralnetworks.so \



# Conscrypt APEX JARs (Java libraries)

APEX_MODULE_LIBS += \

  conscrypt.jar \



# An option to disable the check below, for local use since some build targets

# still may create these libraries in /system (b/129006418).

DISABLE_APEX_LIBS_ABSENCE_CHECK ?=