diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-04-16 18:07:16 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-16 18:07:16 +0000 |
commit | c2b442515eebaa7bfb980b80fbc3c0beb4fa0961 (patch) | |
tree | 8970898a90a860f6d588c3c2763e4cbdf0f58f13 /current/androidx/m2repository/androidx/camera/camera-camera2/1.4.0-alpha05/Android.bp | |
parent | 8f3516097cf131bc317c34ce3a839d1d0a12de4e (diff) | |
parent | 504a9b09569487e4cf2ef42059fe61ba77f60082 (diff) | |
download | sdk-c2b442515eebaa7bfb980b80fbc3c0beb4fa0961.tar.gz |
Merge "Update AndroidX from existing prebuilts" into main
Diffstat (limited to 'current/androidx/m2repository/androidx/camera/camera-camera2/1.4.0-alpha05/Android.bp')
-rw-r--r-- | current/androidx/m2repository/androidx/camera/camera-camera2/1.4.0-alpha05/Android.bp | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/current/androidx/m2repository/androidx/camera/camera-camera2/1.4.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/camera/camera-camera2/1.4.0-alpha05/Android.bp index b947ae4e4..82945c2f6 100644 --- a/current/androidx/m2repository/androidx/camera/camera-camera2/1.4.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/camera/camera-camera2/1.4.0-alpha05/Android.bp @@ -15,35 +15,15 @@ package { } android_library_import { - name: "androidx.camera_camera-camera2-nodeps", - aars: ["camera-camera2-1.4.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.camera_camera-core", - "androidx.concurrent_concurrent-futures", - "androidx.core_core", - "auto_value_annotations", - "guava-listenablefuture-prebuilt-jar", - ], -} - -android_library { name: "androidx.camera_camera-camera2", + aars: ["camera-camera2-1.4.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.camera_camera-camera2-nodeps", "androidx.annotation_annotation", "androidx.camera_camera-core", "androidx.concurrent_concurrent-futures", @@ -51,6 +31,4 @@ android_library { "auto_value_annotations", "guava-listenablefuture-prebuilt-jar", ], - java_version: "1.7", } - |