Merge changes from topic "device_lock"

* changes:
  Add Device Lock module.
  Add allowed dependencies for Device Lock module.
This commit is contained in:
Amos Bianchi
2022-10-21 17:48:58 +00:00
committed by Android (Google) Code Review
2 changed files with 24 additions and 0 deletions

View File

@@ -1042,6 +1042,17 @@ prebuilt_crtend_so(minSdkVersion:(no version))
prebuilt_error_prone_annotations(minSdkVersion:(no version)) prebuilt_error_prone_annotations(minSdkVersion:(no version))
prebuilt_error_prone_annotations(minSdkVersion:29) prebuilt_error_prone_annotations(minSdkVersion:29)
prebuilt_error_prone_annotations(minSdkVersion:current) prebuilt_error_prone_annotations(minSdkVersion:current)
prebuilt_firebase-common-aar(minSdkVersion:14)
prebuilt_firebase-components-aar(minSdkVersion:14)
prebuilt_firebase-datatransport-aar(minSdkVersion:14)
prebuilt_firebase-encoders-jar(minSdkVersion:33)
prebuilt_firebase-encoders-json-aar(minSdkVersion:14)
prebuilt_firebase-iid-aar(minSdkVersion:14)
prebuilt_firebase-iid-interop-aar(minSdkVersion:14)
prebuilt_firebase-installations-aar(minSdkVersion:14)
prebuilt_firebase-installations-interop-aar(minSdkVersion:14)
prebuilt_firebase-measurement-connector-aar(minSdkVersion:14)
prebuilt_firebase-messaging-aar(minSdkVersion:14)
prebuilt_glide-annotation-and-compiler-prebuilt(minSdkVersion:14) prebuilt_glide-annotation-and-compiler-prebuilt(minSdkVersion:14)
prebuilt_glide-disklrucache-prebuilt(minSdkVersion:14) prebuilt_glide-disklrucache-prebuilt(minSdkVersion:14)
prebuilt_glide-gifdecoder-prebuilt(minSdkVersion:14) prebuilt_glide-gifdecoder-prebuilt(minSdkVersion:14)
@@ -1064,7 +1075,14 @@ prebuilt_libnativehelper_header_only(minSdkVersion:(no version))
prebuilt_libperfetto_client_experimental(minSdkVersion:(no version)) prebuilt_libperfetto_client_experimental(minSdkVersion:(no version))
prebuilt_libunwind(minSdkVersion:(no version)) prebuilt_libunwind(minSdkVersion:(no version))
prebuilt_perfetto_trace_protos(minSdkVersion:(no version)) prebuilt_perfetto_trace_protos(minSdkVersion:(no version))
prebuilt_play-services-basement-aar(minSdkVersion:14)
prebuilt_play-services-cloud-messaging-aar(minSdkVersion:14)
prebuilt_play-services-stats-aar(minSdkVersion:14)
prebuilt_play-services-tasks-aar(minSdkVersion:14)
prebuilt_test_framework-sdkextensions(minSdkVersion:(no version)) prebuilt_test_framework-sdkextensions(minSdkVersion:(no version))
prebuilt_transport-api-aar(minSdkVersion:14)
prebuilt_transport-backend-cct-aar(minSdkVersion:14)
prebuilt_transport-runtime-aar(minSdkVersion:14)
resourceobserver_aidl_interface-V1-ndk(minSdkVersion:29) resourceobserver_aidl_interface-V1-ndk(minSdkVersion:29)
resourceobserver_aidl_interface-V1-ndk_platform(minSdkVersion:29) resourceobserver_aidl_interface-V1-ndk_platform(minSdkVersion:29)
rkpd(minSdkVersion:33) rkpd(minSdkVersion:33)

View File

@@ -963,6 +963,12 @@ MAINLINE_MODULES = [
# appear to generate a snapshot for it. # appear to generate a snapshot for it.
for_r_build=None, for_r_build=None,
), ),
MainlineModule(
apex="com.android.devicelock",
sdks=["devicelock-module-sdk"],
first_release=Tiramisu,
last_optional_release=LATEST,
),
MainlineModule( MainlineModule(
apex="com.android.healthconnect", apex="com.android.healthconnect",
sdks=["healthconnect-module-sdk"], sdks=["healthconnect-module-sdk"],