Skip to content

Commit b810f35

Browse files
committed
Glimpse: Update generatebp to v1.28
Change-Id: Ia6979354d4f35e2108cb383984cdc6908c7d35cd
1 parent a09a223 commit b810f35

File tree

2 files changed

+24
-22
lines changed

2 files changed

+24
-22
lines changed

app/libs/Android.bp

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ android_library_import {
3131
"//apex_available:anyapex",
3232
],
3333
static_libs: [
34+
"androidx.core_core",
3435
"Glimpse_androidx.media3_media3-common",
3536
"Glimpse_androidx.media3_media3-exoplayer",
36-
"androidx.core_core",
3737
"kotlinx-coroutines-android",
3838
"kotlinx-coroutines-core",
3939
],
@@ -49,8 +49,8 @@ android_library_import {
4949
"//apex_available:anyapex",
5050
],
5151
static_libs: [
52-
"Glimpse_androidx.media3_media3-common",
5352
"androidx.annotation_annotation",
53+
"Glimpse_androidx.media3_media3-common",
5454
],
5555
}
5656

@@ -64,8 +64,8 @@ android_library_import {
6464
"//apex_available:anyapex",
6565
],
6666
static_libs: [
67-
"Glimpse_androidx.media3_media3-common",
6867
"androidx.annotation_annotation",
68+
"Glimpse_androidx.media3_media3-common",
6969
],
7070
}
7171

@@ -79,10 +79,10 @@ android_library_import {
7979
"//apex_available:anyapex",
8080
],
8181
static_libs: [
82-
"Glimpse_androidx.media3_media3-common",
83-
"Glimpse_androidx.media3_media3-database",
8482
"androidx.annotation_annotation",
8583
"androidx.exifinterface_exifinterface",
84+
"Glimpse_androidx.media3_media3-common",
85+
"Glimpse_androidx.media3_media3-database",
8686
],
8787
}
8888

@@ -96,8 +96,8 @@ android_library_import {
9696
"//apex_available:anyapex",
9797
],
9898
static_libs: [
99-
"Glimpse_androidx.media3_media3-common",
10099
"androidx.annotation_annotation",
100+
"Glimpse_androidx.media3_media3-common",
101101
],
102102
}
103103

@@ -111,16 +111,16 @@ android_library_import {
111111
"//apex_available:anyapex",
112112
],
113113
static_libs: [
114+
"androidx.annotation_annotation",
115+
"androidx.collection_collection",
116+
"androidx.core_core",
117+
"androidx.exifinterface_exifinterface",
114118
"Glimpse_androidx.media3_media3-common",
115119
"Glimpse_androidx.media3_media3-container",
116120
"Glimpse_androidx.media3_media3-database",
117121
"Glimpse_androidx.media3_media3-datasource",
118122
"Glimpse_androidx.media3_media3-decoder",
119123
"Glimpse_androidx.media3_media3-extractor",
120-
"androidx.annotation_annotation",
121-
"androidx.collection_collection",
122-
"androidx.core_core",
123-
"androidx.exifinterface_exifinterface",
124124
],
125125
}
126126

@@ -134,8 +134,8 @@ android_library_import {
134134
"//apex_available:anyapex",
135135
],
136136
static_libs: [
137-
"Glimpse_androidx.media3_media3-exoplayer",
138137
"androidx.annotation_annotation",
138+
"Glimpse_androidx.media3_media3-exoplayer",
139139
],
140140
}
141141

@@ -149,8 +149,8 @@ android_library_import {
149149
"//apex_available:anyapex",
150150
],
151151
static_libs: [
152-
"Glimpse_androidx.media3_media3-exoplayer",
153152
"androidx.annotation_annotation",
153+
"Glimpse_androidx.media3_media3-exoplayer",
154154
],
155155
}
156156

@@ -164,8 +164,8 @@ android_library_import {
164164
"//apex_available:anyapex",
165165
],
166166
static_libs: [
167-
"Glimpse_androidx.media3_media3-exoplayer",
168167
"androidx.annotation_annotation",
168+
"Glimpse_androidx.media3_media3-exoplayer",
169169
],
170170
}
171171

@@ -179,8 +179,8 @@ android_library_import {
179179
"//apex_available:anyapex",
180180
],
181181
static_libs: [
182-
"Glimpse_androidx.media3_media3-exoplayer",
183182
"androidx.annotation_annotation",
183+
"Glimpse_androidx.media3_media3-exoplayer",
184184
],
185185
}
186186

@@ -194,10 +194,10 @@ android_library_import {
194194
"//apex_available:anyapex",
195195
],
196196
static_libs: [
197+
"androidx.annotation_annotation",
197198
"Glimpse_androidx.media3_media3-common",
198199
"Glimpse_androidx.media3_media3-container",
199200
"Glimpse_androidx.media3_media3-decoder",
200-
"androidx.annotation_annotation",
201201
],
202202
}
203203

@@ -211,9 +211,9 @@ android_library_import {
211211
"//apex_available:anyapex",
212212
],
213213
static_libs: [
214-
"Glimpse_androidx.media3_media3-common",
215214
"androidx.annotation_annotation",
216215
"androidx.media_media",
216+
"Glimpse_androidx.media3_media3-common",
217217
"androidx.recyclerview_recyclerview",
218218
],
219219
}
@@ -268,13 +268,13 @@ android_library_import {
268268
"//apex_available:anyapex",
269269
],
270270
static_libs: [
271-
"Glimpse_com.github.bumptech.glide_annotations",
272-
"Glimpse_com.github.bumptech.glide_disklrucache",
273-
"Glimpse_com.github.bumptech.glide_gifdecoder",
274271
"androidx.exifinterface_exifinterface",
275272
"androidx.fragment_fragment",
276273
"androidx.tracing_tracing",
277274
"androidx.vectordrawable_vectordrawable-animated",
275+
"Glimpse_com.github.bumptech.glide_annotations",
276+
"Glimpse_com.github.bumptech.glide_disklrucache",
277+
"Glimpse_com.github.bumptech.glide_gifdecoder",
278278
],
279279
}
280280

@@ -288,9 +288,9 @@ android_library_import {
288288
"//apex_available:anyapex",
289289
],
290290
static_libs: [
291+
"androidx.annotation_annotation",
291292
"Glimpse_com.github.bumptech.glide_glide",
292293
"Glimpse_com.squareup.okhttp3_okhttp",
293-
"androidx.annotation_annotation",
294294
],
295295
}
296296

@@ -332,6 +332,7 @@ java_import {
332332
"//apex_available:anyapex",
333333
],
334334
static_libs: [
335+
"kotlin-stdlib",
335336
"kotlin-stdlib-jdk8",
336337
],
337338
}
@@ -362,6 +363,7 @@ android_library_import {
362363
"androidx.annotation_annotation",
363364
"androidx.exifinterface_exifinterface",
364365
"androidx.lifecycle_lifecycle-common",
366+
"kotlin-stdlib",
365367
"kotlin-stdlib-jdk8",
366368
"kotlinx-coroutines-android",
367369
"kotlinx-coroutines-core",
@@ -394,10 +396,10 @@ android_library_import {
394396
"//apex_available:anyapex",
395397
],
396398
static_libs: [
397-
"Glimpse_io.github.panpf.zoomimage_zoomimage-core",
398399
"androidx.appcompat_appcompat",
399400
"androidx.core_core-ktx",
400401
"androidx.lifecycle_lifecycle-runtime-ktx",
402+
"Glimpse_io.github.panpf.zoomimage_zoomimage-core",
401403
"kotlin-stdlib-jdk8",
402404
],
403405
}

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pluginManagement {
1414
}
1515
mavenCentral()
1616
gradlePluginPortal()
17-
maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.25/.m2")
17+
maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.28/.m2")
1818
}
1919
}
2020

0 commit comments

Comments
 (0)