commit a2d4c6cfbc4ed98b8b9abc7d5744a31fc249c4fd
author android-build-team Robot <android-build-team-robot@google.com> Sun Oct 14 03:15:12 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Oct 14 03:15:12 2018 +0000
tree a58bc3ae9dd46c317ae3a0818919c103f3b82c7a
parent e13e772e5569d1497b5910e0506ce51253cc65d4
parent 7c09a253d15b87e165f6c82093b85d0b7a7bc007

Snap for 5067452 from 7c09a253d15b87e165f6c82093b85d0b7a7bc007 to qt-release

Change-Id: I5e6dd6854d92e5d34523d955f7d0682d1012cd04

Android.bp

diff --git a/Android.bp b/Android.bp
index babf083..2f4d1df 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,10 +21,13 @@
         "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",
 }