| commit | 0ebdd9b3871871e6135762b823ebe8796b4f97a5 | [log] [tgz] |
|---|---|---|
| author | Adam Vartanian <flooey@google.com> | Fri Dec 14 09:42:44 2018 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Dec 14 09:42:44 2018 -0800 |
| tree | c09452c0571d14d6a768fde5da61c81e6937591e | |
| parent | eaf031c91d8ef4d2ad557f02c6dc37ce124d7b68 [diff] | |
| parent | 9288e5c5ad58fe04993f9eecf8bdaf5a422b0c51 [diff] |
Merge "Add Conscrypt APEX to base image" am: 9288e5c5ad Change-Id: I7df64014625f08db8b05918f6f6bb990acf51a41
diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 722ac09..639f733 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk
@@ -51,6 +51,7 @@ cameraserver \ charger \ cmd \ + com.android.conscrypt \ com.android.location.provider \ com.android.resolv \ com.android.tzdata \