这是indexloc提供的服务，不要输入任何密码
Skip to content

fix DexWriter for hiddenapi section #816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

fix DexWriter for hiddenapi section #816

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
011260b
fix DexWriter for hiddenapi section
May 13, 2021
4f418ec
better naming conventions
May 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,14 @@ public int compare(Entry<? extends CallSiteKey, Integer> o1, Entry<? extends Cal
};
}

private static <T extends Comparable<? super T>> Comparator<Entry<?, ? extends T>> comparableValueComparator() {
return new Comparator<Entry<?, ? extends T>>() {
@Override public int compare(Entry<?, ? extends T> o1, Entry<?, ? extends T> o2) {
return o1.getValue().compareTo(o2.getValue());
}
};
}

protected class InternalEncodedValueWriter extends EncodedValueWriter<StringKey, TypeKey, FieldRefKey, MethodRefKey,
AnnotationElement, ProtoRefKey, MethodHandleKey, EncodedValue> {
private InternalEncodedValueWriter(@Nonnull DexDataWriter writer) {
Expand Down Expand Up @@ -491,24 +499,27 @@ private void writeClasses(@Nonnull DexDataStore dataStore, @Nonnull DexDataWrite
classIndexSectionOffset = indexWriter.getPosition();
classDataSectionOffset = offsetWriter.getPosition();

List<Map.Entry<? extends ClassKey, Integer>> classEntries = Lists.newArrayList(classSection.getItems());
Collections.sort(classEntries, DexWriter.<ClassKey>comparableKeyComparator());
List<Map.Entry<? extends ClassKey, Integer>> classEntriesKeySorted = Lists.newArrayList(classSection.getItems());
Collections.sort(classEntriesKeySorted, DexWriter.<ClassKey>comparableKeyComparator());

int index = 0;
for (Map.Entry<? extends ClassKey, Integer> key: classEntries) {
for (Map.Entry<? extends ClassKey, Integer> key: classEntriesKeySorted) {
index = writeClass(indexWriter, offsetWriter, index, key);
}

if (!shouldWriteHiddenApiRestrictions()) {
return;
}

offsetWriter.align();
hiddenApiRestrictionsOffset = offsetWriter.getPosition();

RestrictionsWriter restrictionsWriter = new RestrictionsWriter(dataStore, offsetWriter, classEntries.size());
List<Map.Entry<? extends ClassKey, Integer>> classEntriesValueSorted = Lists.newArrayList(classSection.getItems());
Collections.sort(classEntriesValueSorted, DexWriter.comparableValueComparator());
RestrictionsWriter restrictionsWriter = new RestrictionsWriter(dataStore, offsetWriter, classEntriesValueSorted.size());

try {
for (Map.Entry<? extends ClassKey, Integer> key : classEntries) {
for (Map.Entry<? extends ClassKey, Integer> key : classEntriesValueSorted) {

for (FieldKey fieldKey : classSection.getSortedStaticFields(key.getKey())) {
restrictionsWriter.writeRestriction(classSection.getFieldHiddenApiRestrictions(fieldKey));
Expand Down