commit a4226d1942a6311252b7f583693aef1c3871cf23
author Jiyong Park <jiyong@google.com> Mon Dec 02 13:58:44 2019 +0900
committer Jiyong Park <jiyong@google.com> Fri Dec 20 13:13:50 2019 +0900
tree a5e7618b25616bcfcd84f24d58a66b833e2284a7
parent 3977cb4f755739fa83b4b95639b58f245b43f6f5

Use apex_available property

Use apex_available property to prevent modules that are only for the
conscrypt apex from being used outside of the APEX.

Bug: 128708192
Bug: 133140750
Test: m
Change-Id: I08ca6cd8e5e4a254d9dd62695ee3ed317503d874

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 17ac502..37a0b98 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1121,18 +1121,10 @@
   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 ?=