diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-10-21 18:08:46 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-10-21 18:08:46 +0000 |
commit | 733c14176a7b7ac4c46a6982b3feb2ffbf0a987e (patch) | |
tree | e1d570d1601d5028905982c917cfd68abf35ec75 | |
parent | dbbf994ae28c83c15a77cc85c3b8519d0c71b83b (diff) | |
parent | 7737e3dc0188ac22bbab8872df869559674eac40 (diff) | |
download | development-android10-android13-mainline-tzdata-release.tar.gz |
Snap for 6921388 from 7737e3dc0188ac22bbab8872df869559674eac40 to qt-aml-tzdata-releaseq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release
Change-Id: Ifd12803a5cd299585320ba0af9aa07f91b7b4e06
-rw-r--r-- | build/optional.json | 5 | ||||
-rw-r--r-- | build/sdk.atree | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/build/optional.json b/build/optional.json index 4b3bedf9a..b63c165e8 100644 --- a/build/optional.json +++ b/build/optional.json @@ -5,6 +5,11 @@ "manifest": false }, { + "name": "android.car", + "jar": "android.car.jar", + "manifest": false + }, + { "name": "android.test.mock", "jar": "android.test.mock.jar", "manifest": false diff --git a/build/sdk.atree b/build/sdk.atree index e42781704..25e1d6fea 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -172,6 +172,8 @@ ${OUT_DIR}/target/common/obj/PACKAGING/android_jar_intermediates/android-stubs-s # optional API files. development/build/optional.json platforms/${PLATFORM_NAME}/optional/optional.json ${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/org.apache.http.legacy.stubs_intermediates/classes.jar platforms/${PLATFORM_NAME}/optional/org.apache.http.legacy.jar +# Android Automotive OS stubs. +prebuilts/sdk/29/public/android.car.jar platforms/${PLATFORM_NAME}/optional/android.car.jar # deprecated APIs ${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android_uiautomator_intermediates/classes.jar platforms/${PLATFORM_NAME}/uiautomator.jar # Test APIs |