Skip to content

Commit

Permalink
Fix mobile-install v1 on Pie devices
Browse files Browse the repository at this point in the history
    Ref: bazelbuild/bazel#6814

    RELNOTES: Fixed a mobile-install v1 bug when deploying to Android 9 Pie devices. bazelbuild/bazel#6814
    PiperOrigin-RevId: 224566583
  • Loading branch information
Luca Di Grazia committed Sep 4, 2022
1 parent 68c6816 commit b835f0a
Showing 1 changed file with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -366,9 +366,9 @@ private String copyNativeLibs(String dataDir) throws IOException {
}

Map<String, String> newManifest = parseManifest(newManifestFile);
Map<String, String> installedManifest = new LinkedHashMap<String, String>();
Set<String> libsToDelete = new LinkedHashSet<String>();
Set<String> libsToUpdate = new LinkedHashSet<String>();
Map<String, String> installedManifest = new HashMap<String, String>();
Set<String> libsToDelete = new HashSet<String>();
Set<String> libsToUpdate = new HashSet<String>();

String realNativeLibDir = newManifest.isEmpty()
? defaultNativeLibDir : incrementalDir.toString();
Expand Down Expand Up @@ -437,7 +437,7 @@ private String copyNativeLibs(String dataDir) throws IOException {
}

private static Map<String, String> parseManifest(File file) throws IOException {
Map<String, String> result = new LinkedHashMap<>();
Map<String, String> result = new HashMap<>();
try (BufferedReader reader = new BufferedReader(new FileReader(file))) {
while (true) {
String line = reader.readLine();
Expand Down

0 comments on commit b835f0a

Please sign in to comment.