Skip to content

Commit be8f7e7

Browse files
authored
refactor: new BinaryXmlResourceParser, ResXmlSerializer and more (#4077)
1 parent 1981d35 commit be8f7e7

File tree

76 files changed

+3577
-4020
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+3577
-4020
lines changed

brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,11 @@ private enum Verbosity { NORMAL, VERBOSE, QUIET }
130130
+ "fix them manually before building.")
131131
.get();
132132

133+
private static final Option decodeIgnoreRawValuesOption = Option.builder()
134+
.longOpt("ignore-raw-values")
135+
.desc("Ignore raw attribute values in XML resource files.")
136+
.get();
137+
133138
private static final Option decodeMatchOriginalOption = Option.builder()
134139
.longOpt("match-original")
135140
.desc("Keep files closest to original as possible (prevents rebuild).")
@@ -241,6 +246,7 @@ private static void loadOptions(Options options, boolean advanced) {
241246
decodeOptions.addOption(jobsOption);
242247
decodeOptions.addOption(libOption);
243248
if (advanced) {
249+
decodeOptions.addOption(decodeIgnoreRawValuesOption);
244250
decodeOptions.addOption(decodeKeepBrokenResOption);
245251
decodeOptions.addOption(decodeMatchOriginalOption);
246252
decodeOptions.addOption(decodeNoAssetsOption);
@@ -483,6 +489,13 @@ private static void cmdDecode(String[] args) throws AndrolibException {
483489
config.setKeepBrokenResources(true);
484490
}
485491
}
492+
if (cli.hasOption(decodeIgnoreRawValuesOption)) {
493+
if (cli.hasOption(decodeNoResOption)) {
494+
printOptionConflict(decodeIgnoreRawValuesOption, decodeNoResOption);
495+
} else {
496+
config.setIgnoreRawValues(true);
497+
}
498+
}
486499
if (cli.hasOption(decodeMatchOriginalOption)) {
487500
config.setAnalysisMode(true);
488501
}

brut.apktool/apktool-lib/src/main/java/android/content/res/XmlResourceParser.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

brut.apktool/apktool-lib/src/main/java/android/util/AttributeSet.java

Lines changed: 0 additions & 284 deletions
This file was deleted.

0 commit comments

Comments
 (0)