Merge "Use apex_available property"
am: 8029967a99
Change-Id: Ib6430362919ac9b41ae01d933ab2db3c58ad65b3
This commit is contained in:
@@ -1121,18 +1121,10 @@ APEX_MODULE_LIBS += \
|
|||||||
libdl_android.so \
|
libdl_android.so \
|
||||||
libm.so \
|
libm.so \
|
||||||
|
|
||||||
# Conscrypt APEX libraries
|
|
||||||
APEX_MODULE_LIBS += \
|
|
||||||
libjavacrypto.so \
|
|
||||||
|
|
||||||
# Android Neural Network API (NNAPI) APEX (native) libraries
|
# Android Neural Network API (NNAPI) APEX (native) libraries
|
||||||
APEX_MODULE_LIBS += \
|
APEX_MODULE_LIBS += \
|
||||||
libneuralnetworks.so \
|
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
|
# An option to disable the check below, for local use since some build targets
|
||||||
# still may create these libraries in /system (b/129006418).
|
# still may create these libraries in /system (b/129006418).
|
||||||
DISABLE_APEX_LIBS_ABSENCE_CHECK ?=
|
DISABLE_APEX_LIBS_ABSENCE_CHECK ?=
|
||||||
|
Reference in New Issue
Block a user