Merge "Update frameworks to use unbundled version of BouncyCastle." am: 9671b7eca8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559779 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I691da785142fee5967674ac2cf1261e71c1f16e3
This commit is contained in:
@@ -53,6 +53,7 @@ android_test {
|
||||
jarjar_rules: "jarjar-rules.txt",
|
||||
static_libs: [
|
||||
"androidx.test.rules",
|
||||
"bouncycastle-repackaged-unbundled",
|
||||
"FrameworksNetCommonTests",
|
||||
"frameworks-base-testutils",
|
||||
"frameworks-net-integration-testutils",
|
||||
|
||||
@@ -30,7 +30,7 @@ import androidx.test.runner.AndroidJUnit4;
|
||||
|
||||
import com.android.internal.net.VpnProfile;
|
||||
import com.android.net.module.util.ProxyUtils;
|
||||
import com.android.org.bouncycastle.x509.X509V1CertificateGenerator;
|
||||
import com.android.internal.org.bouncycastle.x509.X509V1CertificateGenerator;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
Reference in New Issue
Block a user