diff options
| author | Tao Bao <tbao@google.com> | 2018-11-06 23:23:30 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-06 23:23:30 +0100 |
| commit | cf2a142c4370c023eb62f86fb193e1c6b1d62b02 (patch) | |
| tree | c5a1511e8f551f2e05fb549da0d9cc6f912199fc | |
| parent | Merge "tests: Add a testcase for updater overrun while patching." am: d1f105a466 am: 5a47206ffb (diff) | |
| parent | Merge changes If24c6b7c,I381b0103 am: 67b7e64034 (diff) | |
| download | android_bootable_recovery-cf2a142c4370c023eb62f86fb193e1c6b1d62b02.tar android_bootable_recovery-cf2a142c4370c023eb62f86fb193e1c6b1d62b02.tar.gz android_bootable_recovery-cf2a142c4370c023eb62f86fb193e1c6b1d62b02.tar.bz2 android_bootable_recovery-cf2a142c4370c023eb62f86fb193e1c6b1d62b02.tar.lz android_bootable_recovery-cf2a142c4370c023eb62f86fb193e1c6b1d62b02.tar.xz android_bootable_recovery-cf2a142c4370c023eb62f86fb193e1c6b1d62b02.tar.zst android_bootable_recovery-cf2a142c4370c023eb62f86fb193e1c6b1d62b02.zip | |
| -rw-r--r-- | PREUPLOAD.cfg | 3 | ||||
| -rw-r--r-- | tools/image_generator/ImageGenerator.java | 24 |
2 files changed, 12 insertions, 15 deletions
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg index 108429193..28aa06f45 100644 --- a/PREUPLOAD.cfg +++ b/PREUPLOAD.cfg @@ -7,5 +7,4 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp [Hook Scripts] checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT} - -fw updater_sample/ - + --file_whitelist tools/ updater_sample/ diff --git a/tools/image_generator/ImageGenerator.java b/tools/image_generator/ImageGenerator.java index 8ed696a45..8cdd4944a 100644 --- a/tools/image_generator/ImageGenerator.java +++ b/tools/image_generator/ImageGenerator.java @@ -16,6 +16,16 @@ package com.android.recovery.tools; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.GnuParser; +import org.apache.commons.cli.HelpFormatter; +import org.apache.commons.cli.OptionBuilder; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + import java.awt.Color; import java.awt.Font; import java.awt.FontFormatException; @@ -32,25 +42,14 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; -import java.util.TreeMap; import java.util.StringTokenizer; +import java.util.TreeMap; import javax.imageio.ImageIO; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.GnuParser; -import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.OptionBuilder; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; - -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - /** * Command line tool to generate the localized image for recovery mode. */ @@ -552,4 +551,3 @@ public class ImageGenerator { imageGenerator.generateImage(localizedStringMap, cmd.getOptionValue("output_file")); } } - |