From ac4a35f017f8c6c562da7fd4fc1f1eb339867af3 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Thu, 19 Dec 2019 21:45:31 +0900
Subject: [PATCH] Add boringssl_self_test to PRODUCT_PACKAGES

boringssl_self_test is a required module of the conscrypt.jar.
Therefore, it was installed along with the conscrypt.jar. However,
conscrypt.jar is no longer available for the platform but only for the
conscrypt APEX. The problem here is that the conscrypt APEX having
conscrypt.jar doesn't carry its 'required' property. As a result,
boringssl_self_test is missing. This is b/146549048.

Until the bug is fixed, manually adding the test binary to
PRODUCT_PACKAGES to ensure that it is installed always.

Bug: 146549048
Test: m, device boots

Change-Id: I72dbc51c267f8d8683b70c07ae726c3a3eba0aea
---
 target/product/base_system.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index d15e26208..5916bfee0 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -269,6 +269,10 @@ PRODUCT_PACKAGES += \
     wifi-service \
     wm \
 
+# TODO(b/146549048) remove this
+PRODUCT_PACKAGES += \
+    boringssl_self_test
+
 # VINTF data for system image
 PRODUCT_PACKAGES += \
     system_manifest.xml \