* Decompile and recreate Soul Browser v1.4.85 with APK CI builds Co-authored-by: KaKi87 <KaKi87@pm.me> * Fix CI build: include bundled google.jks and remove PR trigger The apktool build failed in CI because app/unknown/.../google.jks was excluded by the *.jks gitignore rule. Whitelist app-bundled JKS files and commit the missing resource. Also remove the redundant pull_request workflow trigger. Co-authored-by: KaKi87 <KaKi87@pm.me> * Change package ID to com.github.kaki87.soulbrowser Rename the application ID so the rebuilt APK can be installed alongside the original Soul Browser from Google Play. - Update AndroidManifest package, permissions, providers, and actions - Update R class references in smali (com/github/kaki87/soulbrowser/R) - Update shortcuts.xml targetPackage - Rename app label to "Soul Rebuild" for easy identification Co-authored-by: KaKi87 <KaKi87@pm.me> * Fix install compatibility: remove split APK metadata and bundle native libs The rebuilt APK still declared requiredSplitTypes and Play Store split metadata, causing Android to reject standalone installs as incompatible. - Remove requiredSplitTypes and split-related manifest meta-data - Merge native libs from all ABI splits with uncompressed storage - Page-align before signing for extractNativeLibs=false - Add .so to apktool doNotCompress list Co-authored-by: KaKi87 <KaKi87@pm.me> * Fix install failure: use apksigner v2/v3 and bundle arm64 native libs Target SDK 36 requires APK Signature Scheme v2+, but jarsigner only produces v1 signatures, causing Android to reject the install. - Sign with apksigner (v1+v2+v3) instead of jarsigner - Add arm64-v8a native libraries from universal Soul Browser 1.4.79 - Set extractNativeLibs=true for reliable sideload installs - Commit stable debug keystore for consistent signatures across builds Co-authored-by: KaKi87 <KaKi87@pm.me> * Add committed debug keystore for consistent APK signatures Co-authored-by: KaKi87 <KaKi87@pm.me> * Fix startup crash: use original classes2.dex desugar libraries Apktool recompiles smali_classes2 into a broken classes2.dex, causing ClassNotFoundException for j$.com.android.tools.r8.a at ML Kit init. Inject the original classes2.dex (Java 8+ desugar libs) after apktool build instead of using the recompiled version. Co-authored-by: KaKi87 <KaKi87@pm.me> * Fix missing drawable resources from density split APKs The base APK is an app bundle module; density-specific drawables like seek_thumb_nor_b live in config.xhdpi.apk and were missing after rebuild, causing Resources$NotFoundException at runtime. - Merge non-9-patch resources from split APKs before apktool build - Sync public.xml IDs from R smali only when backing files exist - Add 713 density-specific resource IDs to public.xml Co-authored-by: KaKi87 <KaKi87@pm.me> --------- Co-authored-by: Cursor Agent <cursoragent@cursor.com>
85 lines
3.4 KiB
Java
85 lines
3.4 KiB
Java
package com.google.mlkit.common.sdkinternal;
|
|
|
|
import com.google.android.gms.common.annotation.KeepForSdk;
|
|
import com.google.android.gms.common.internal.Preconditions;
|
|
import com.google.android.gms.internal.mlkit_common.zzav;
|
|
import java.util.ArrayDeque;
|
|
import java.util.Deque;
|
|
import java.util.concurrent.Executors;
|
|
import java.util.concurrent.LinkedBlockingQueue;
|
|
import java.util.concurrent.ThreadFactory;
|
|
import java.util.concurrent.ThreadPoolExecutor;
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
@KeepForSdk
|
|
/* loaded from: classes3.dex */
|
|
public class MlKitThreadPool extends zzav {
|
|
public static final ThreadLocal f = new ThreadLocal();
|
|
|
|
/* renamed from: c, reason: collision with root package name */
|
|
public final ThreadPoolExecutor f12773c;
|
|
|
|
public MlKitThreadPool() {
|
|
final ThreadFactory defaultThreadFactory = Executors.defaultThreadFactory();
|
|
int availableProcessors = Runtime.getRuntime().availableProcessors();
|
|
ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(availableProcessors, availableProcessors, 60L, TimeUnit.SECONDS, new LinkedBlockingQueue(), new ThreadFactory() { // from class: com.google.mlkit.common.sdkinternal.zzj
|
|
@Override // java.util.concurrent.ThreadFactory
|
|
public final Thread newThread(final Runnable runnable) {
|
|
return defaultThreadFactory.newThread(new Runnable() { // from class: com.google.mlkit.common.sdkinternal.zzk
|
|
@Override // java.lang.Runnable
|
|
public final void run() {
|
|
MlKitThreadPool.f.set(new ArrayDeque());
|
|
runnable.run();
|
|
}
|
|
});
|
|
}
|
|
});
|
|
this.f12773c = threadPoolExecutor;
|
|
threadPoolExecutor.allowCoreThreadTimeOut(true);
|
|
}
|
|
|
|
@Override // com.google.android.gms.internal.mlkit_common.zzav, com.google.android.gms.internal.mlkit_common.zzx
|
|
public final /* synthetic */ Object a() {
|
|
return this.f12773c;
|
|
}
|
|
|
|
@Override // com.google.android.gms.internal.mlkit_common.zzav
|
|
public final ThreadPoolExecutor b() {
|
|
return this.f12773c;
|
|
}
|
|
|
|
@Override // com.google.android.gms.internal.mlkit_common.zzav, java.util.concurrent.Executor
|
|
public final void execute(final Runnable runnable) {
|
|
Deque deque = (Deque) f.get();
|
|
if (deque != null && deque.size() <= 1) {
|
|
Preconditions.checkNotNull(deque);
|
|
deque.add(runnable);
|
|
if (deque.size() > 1) {
|
|
return;
|
|
}
|
|
do {
|
|
runnable.run();
|
|
deque.removeFirst();
|
|
runnable = (Runnable) deque.peekFirst();
|
|
} while (runnable != null);
|
|
return;
|
|
}
|
|
this.f12773c.execute(new Runnable() { // from class: com.google.mlkit.common.sdkinternal.zzi
|
|
@Override // java.lang.Runnable
|
|
public final void run() {
|
|
Deque deque2 = (Deque) MlKitThreadPool.f.get();
|
|
Preconditions.checkNotNull(deque2);
|
|
Runnable runnable2 = runnable;
|
|
deque2.add(runnable2);
|
|
if (deque2.size() > 1) {
|
|
return;
|
|
}
|
|
do {
|
|
runnable2.run();
|
|
deque2.removeFirst();
|
|
runnable2 = (Runnable) deque2.peekFirst();
|
|
} while (runnable2 != null);
|
|
}
|
|
});
|
|
}
|
|
}
|