Merge "Use apex_available property"

2019-12-20 06:48:33 +00:00
parent 3977cb4f75 a4226d1942
commit 8029967a99
1 changed files with 0 additions and 8 deletions
--- a/core/main.mk
+++ b/core/main.mk
@@ -1121,18 +1121,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 ?=