From 26e8acb9aa229a888ea9af10454c4c03abfc3aab Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Fri, 20 Sep 2019 14:44:55 +0100
Subject: Remove duplicate libraries that are provided by system modules

An improvement in the Soong build means that it is no longer necessary
to duplicate the libraries that it provides. This change removes the
duplicates and moves the system_modules property next to sdk_version
property to be consistent and because those properties are tightly
coupled.

Bug: 141359858
Test: m checkbuild
Change-Id: I8b9002cc034ef5b8dc10de815286572cc0479887
---
 Android.bp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Android.bp b/Android.bp
index 765c264..21b6cc2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -30,12 +30,8 @@ java_library_static {
         "java/com/google/security/wycheproof/SpongyCastleAllTests.java",
     ],
     sdk_version: "none",
+    system_modules: "core-system-modules",
     libs: [
-        "core-oj",
-        "core-libart",
-        "bouncycastle",
-        "conscrypt",
         "junit",
     ],
-    system_modules: "core-system-modules",
 }
-- 
cgit v1.2.3