Merge "Update frameworks to use unbundled version of BouncyCastle."
This commit is contained in:
commit
9671b7eca8
2 changed files with 2 additions and 1 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue