Merge "Use apex_available property" am: 8029967a99
am: d030761781
Change-Id: I980478ff17779ac10f1dbbce26eedb7e69b8c9d1
This commit is contained in:
commit
b84f1489a2
|
@ -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 ?=
|
||||
|
|
Loading…
Reference in New Issue