diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-28 02:29:25 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-28 02:29:25 +0000 |
| commit | 2757d32184dc1ed365aca3119eb41129be828f51 (patch) | |
| tree | a28d022535bc502b657bee4056177460f86401aa | |
| parent | 7b0f64a3fe5011cbd0fc6714194b5c6697932857 (diff) | |
| parent | 83ba46a95648f47dd102638a0dd49e9559a1f743 (diff) | |
| download | sdk-2757d32184dc1ed365aca3119eb41129be828f51.tar.gz | |
Snap for 9535926 from 83ba46a95648f47dd102638a0dd49e9559a1f743 to tm-qpr3-release
Change-Id: If568d301c78089af9b64530b1e5c642b047692c8
| -rw-r--r-- | current/aaos-libs/Android.bp | 41 | ||||
| -rw-r--r-- | current/aaos-libs/car-ui-lib-no-overlayable.aar | bin | 0 -> 724045 bytes | |||
| -rwxr-xr-x | current/aaos-libs/update_prebuilts.sh | 5 |
3 files changed, 46 insertions, 0 deletions
diff --git a/current/aaos-libs/Android.bp b/current/aaos-libs/Android.bp index 5b1f8e2cf..61753b90c 100644 --- a/current/aaos-libs/Android.bp +++ b/current/aaos-libs/Android.bp @@ -223,6 +223,47 @@ android_library_import { ], } +android_library { + name: "car-ui-lib-no-overlayable", + min_sdk_version: "28", + target_sdk_version: "30", + sdk_version: "31", + static_libs:[ + "car-ui-lib-source-no-overlayable", + "androidx.annotation_annotation", + "androidx.appcompat_appcompat", + "androidx-constraintlayout_constraintlayout", + "androidx.preference_preference", + "androidx.recyclerview_recyclerview", + "androidx-constraintlayout_constraintlayout-solver", + "androidx.asynclayoutinflater_asynclayoutinflater", + ], + apex_available: [ + "com.android.permission", + "//apex_available:platform", + ], +} + +android_library_import { + name: "car-ui-lib-source-no-overlayable", + aars: ["car-ui-lib-no-overlayable.aar"], + min_sdk_version: "28", + sdk_version: "31", + static_libs:[ + "androidx.annotation_annotation", + "androidx.appcompat_appcompat", + "androidx-constraintlayout_constraintlayout", + "androidx.preference_preference", + "androidx.recyclerview_recyclerview", + "androidx-constraintlayout_constraintlayout-solver", + "androidx.asynclayoutinflater_asynclayoutinflater", + ], + apex_available: [ + "com.android.permission", + "//apex_available:platform", + ], +} + java_import { name: "car-ui-lib-oem-apis-source", jars: ["car-ui-lib-oem-apis.jar"], diff --git a/current/aaos-libs/car-ui-lib-no-overlayable.aar b/current/aaos-libs/car-ui-lib-no-overlayable.aar Binary files differnew file mode 100644 index 000000000..daf14c2f2 --- /dev/null +++ b/current/aaos-libs/car-ui-lib-no-overlayable.aar diff --git a/current/aaos-libs/update_prebuilts.sh b/current/aaos-libs/update_prebuilts.sh index 1738bca41..c3ef971b2 100755 --- a/current/aaos-libs/update_prebuilts.sh +++ b/current/aaos-libs/update_prebuilts.sh @@ -48,6 +48,8 @@ case $LIB_TARGET in downloadApp $1 "car-uxr-client-lib.aar" "car-uxr-client-lib.aar" $BUILD_TARGET echo "Downloading car-ui-lib-testing-support.aar" downloadApp $1 "car-ui-lib-testing-support.aar" "car-ui-lib-testing-support.aar" "car_apps-user" + echo "Downloading car-ui-lib-no-overlayable.aar" + downloadApp $1 "car-ui-lib-no-overlayable.aar" "car-ui-lib-no-overlayable.aar" "car_apps-user" ;; car-apps-common) echo "Downloading car-apps-common" @@ -82,6 +84,9 @@ case $LIB_TARGET in # TODO(b/258809109): car-ui-lib-testing-support doesn't have a gradle target yet. echo "Downloading car-ui-lib-testing-support.aar" downloadApp $1 "car-ui-lib-testing-support.aar" "car-ui-lib-testing-support.aar" "car_apps-user" + # TODO(b/258809109): car-ui-lib-no-overlayable doesn't have a gradle target yet. + echo "Downloading car-ui-lib-no-overlayable.aar" + downloadApp $1 "car-ui-lib-no-overlayable.aar" "car-ui-lib-no-overlayable.aar" "car_apps-user" ;; *) echo "Invalid application option {all|car-apps-common|car-assist-lib|car-media-common|car-messaging-models|car-uxr-client-lib|car-telephony-common|car-ui-lib}" |