diff options
| author | Anton Hansson <hansson@google.com> | 2021-06-08 18:19:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-08 18:19:40 +0000 |
| commit | ae96fa6c22876c104726d6da41761dd05d68da95 (patch) | |
| tree | 69e8f89b4ec4ee3603aeb297ebe034319f5ffd5d | |
| parent | 30dc68bf29d3585cdec0de6e06e711c6df72346f (diff) | |
| parent | d79bbdd2ee939bea9447beaa597ab02904960f4e (diff) | |
| download | platform_packages_modules_SdkExtensions-ae96fa6c22876c104726d6da41761dd05d68da95.tar.gz platform_packages_modules_SdkExtensions-ae96fa6c22876c104726d6da41761dd05d68da95.tar.bz2 platform_packages_modules_SdkExtensions-ae96fa6c22876c104726d6da41761dd05d68da95.zip | |
Add conscrypt module to the set of R modules am: d79bbdd2ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/14881596
Change-Id: Ic1edc951cfebe06897c2e29080c2953352a52e92
| -rw-r--r-- | derive_sdk/derive_sdk.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/derive_sdk/derive_sdk.cpp b/derive_sdk/derive_sdk.cpp index 63c8a44..0b503de 100644 --- a/derive_sdk/derive_sdk.cpp +++ b/derive_sdk/derive_sdk.cpp @@ -36,6 +36,7 @@ namespace derivesdk { static const std::unordered_map<std::string, SdkModule> kApexNameToModule = { {"com.android.art", SdkModule::ART}, + {"com.android.conscrypt", SdkModule::CONSCRYPT}, {"com.android.ipsec", SdkModule::IPSEC}, {"com.android.media", SdkModule::MEDIA}, {"com.android.mediaprovider", SdkModule::MEDIA_PROVIDER}, @@ -47,10 +48,8 @@ static const std::unordered_map<std::string, SdkModule> kApexNameToModule = { }; static const std::unordered_set<SdkModule> kRModules = { - SdkModule::IPSEC, SdkModule::MEDIA, - SdkModule::MEDIA_PROVIDER, SdkModule::PERMISSIONS, - SdkModule::SDK_EXTENSIONS, SdkModule::STATSD, - SdkModule::TETHERING, + SdkModule::CONSCRYPT, SdkModule::IPSEC, SdkModule::MEDIA, SdkModule::MEDIA_PROVIDER, + SdkModule::PERMISSIONS, SdkModule::SDK_EXTENSIONS, SdkModule::STATSD, SdkModule::TETHERING, }; static const std::unordered_set<SdkModule> kSModules = {SdkModule::ART, SdkModule::SCHEDULING}; |