tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes If24c6b7c,I381b0103

Browse source 
* changes:
  image_generator: Fix the warnings on import order.
  Add tools/ to the style-checking path.
This commit is contained in:
Tao Bao 2018-11-06 22:04:50 +00:00 committed by Gerrit Code Review
commit 67b7e64034
2 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
PREUPLOAD.cfg
View file

@ -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/

24
tools/image_generator/ImageGenerator.java
View file

@ -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"));
}
}