From a4226d1942a6311252b7f583693aef1c3871cf23 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Mon, 2 Dec 2019 13:58:44 +0900
Subject: [PATCH] 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 | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/core/main.mk b/core/main.mk
index 17ac502330..37a0b98c4f 100644
--- 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 ?=