tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use apex_available property" am: 8029967a99 am: d030761781

Browse source 
Change-Id: I980478ff17779ac10f1dbbce26eedb7e69b8c9d1
This commit is contained in:
Automerger Merge Worker 2019-12-20 07:05:46 +00:00
commit b84f1489a2
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/main.mk
View file

@ -1118,18 +1118,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 ?=