From 0b75d36471cb83dcca586bb7b837611691be9f0c Mon Sep 17 00:00:00 2001
From: Neil Fuller <nfuller@google.com>
Date: Thu, 4 Oct 2018 11:01:10 +0100
Subject: Add explicit dependencies on "core" libraries

The dependencies are necessary since the code uses
conscrypt and bouncycastle impl details / internals.

Test: build
Bug: 113148576
Change-Id: I35ed7c1707db2c83899a374c396e86e7817d85ff
---
 Android.bp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Android.bp b/Android.bp
index babf083..2f4d1df 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,10 +21,13 @@ java_library_static {
         "java/com/google/security/wycheproof/SpongyCastleTest.java",
         "java/com/google/security/wycheproof/SpongyCastleAllTests.java",
     ],
-    no_framework_libs: true,
+    no_standard_libs: true,
     libs: [
-        "conscrypt",
+        "core-oj",
+        "core-libart",
         "bouncycastle",
+        "conscrypt",
         "junit",
     ],
+    system_modules: "core-system-modules",
 }
-- 
cgit v1.2.3