Upstream version 10.39.233.0
[platform/framework/web/crosswalk.git] / src / xwalk / app / tools / android / customize.py
index c8eac2e..eb2d7b6 100755 (executable)
@@ -1,23 +1,60 @@
 #!/usr/bin/env python
 
-# Copyright (c) 2013 Intel Corporation. All rights reserved.
+# Copyright (c) 2013,2014 Intel Corporation. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import compress_js_and_css
+import fnmatch
 import json
 import optparse
 import os
 import re
 import shutil
+import stat
 import sys
 
+# get xwalk absolute path so we can run this script from any location
+xwalk_dir = os.path.dirname(os.path.abspath(__file__))
+sys.path.append(xwalk_dir)
+
+from app_info import AppInfo
+from customize_launch_screen import CustomizeLaunchScreen
 from handle_xml import AddElementAttribute
 from handle_xml import AddElementAttributeAndText
 from handle_xml import EditElementAttribute
 from handle_xml import EditElementValueByNodeName
 from handle_permissions import HandlePermissions
+from util import CleanDir, CreateAndCopyDir, GetBuildDir
 from xml.dom import minidom
 
+
+TEMPLATE_DIR_NAME = 'template'
+
+
+def VerifyPackageName(value):
+  regex = r'^[a-z][a-z0-9_]*(\.[a-z][a-z0-9_]*)+$'
+  descrpt = 'Each part of package'
+  sample = 'org.xwalk.example, org.xwalk.example_'
+
+  if len(value) >= 128:
+    print('To be safe, the length of package name or app name '
+          'should be less than 128.')
+    sys.exit(6)
+
+  if not re.match(regex, value):
+    print('Error: %s name should be started with letters and should not '
+          'contain invalid characters.\n'
+          'It may contain lowercase letters, numbers, blank spaces and '
+          'underscores\n'
+          'Sample: %s' % (descrpt, sample))
+    sys.exit(6)
+
+
+def ReplaceSpaceWithUnderscore(value):
+  return value.replace(' ', '_')
+
+
 def ReplaceInvalidChars(value, mode='default'):
   """ Replace the invalid chars with '_' for input string.
   Args:
@@ -27,47 +64,124 @@ def ReplaceInvalidChars(value, mode='default'):
   if mode == 'default':
     invalid_chars = '\/:*?"<>|- '
   elif mode == 'apkname':
-    invalid_chars = '\/:.*?"<>|-'
+    invalid_chars = '\/:.*?"<>|- '
   for c in invalid_chars:
     if mode == 'apkname' and c in value:
-      print("Illegal character: '%s' is replaced with '_'" % c)
-    value = value.replace(c,'_')
+      print('Illegal character: "%s" replaced with "_"' % c)
+    value = value.replace(c, '_')
   return value
 
 
-def Prepare(sanitized_name, package, app_root):
-  if os.path.exists(sanitized_name):
-    shutil.rmtree(sanitized_name)
-  shutil.copytree('app_src', sanitized_name)
-  shutil.rmtree(os.path.join(sanitized_name, 'src'))
-  src_root = os.path.join('app_src', 'src', 'org', 'xwalk', 'app', 'template')
-  src_activity = os.path.join(src_root, 'AppTemplateActivity.java')
-  if not os.path.isfile(src_activity):
-    print ('Please make sure that the java file'
-           ' of activity does exist.')
+def GetFilesByExt(path, ext, sub_dir=True):
+  if os.path.exists(path):
+    file_list = []
+    for name in os.listdir(path):
+      full_name = os.path.join(path, name)
+      st = os.lstat(full_name)
+      if stat.S_ISDIR(st.st_mode) and sub_dir:
+        file_list += GetFilesByExt(full_name, ext)
+      elif os.path.isfile(full_name):
+        if fnmatch.fnmatch(full_name, ext):
+          file_list.append(full_name)
+    return file_list
+  else:
+    return []
+
+
+def ParseParameterForCompressor(option, value, values, parser):
+  if ((not values or values.startswith('-'))
+      and value.find('--compressor') != -1):
+    values = 'all'
+  val = values
+  if parser.rargs and not parser.rargs[0].startswith('-'):
+    val = parser.rargs[0]
+    parser.rargs.pop(0)
+  setattr(parser.values, option.dest, val)
+
+
+def CompressSourceFiles(app_root, compressor):
+  js_list = []
+  css_list = []
+  js_ext = '*.js'
+  css_ext = '*.css'
+
+  if compressor == 'all' or compressor == 'js':
+    js_list = GetFilesByExt(app_root, js_ext)
+    compress_js_and_css.CompressJavaScript(js_list)
+
+  if compressor == 'all' or compressor == 'css':
+    css_list = GetFilesByExt(app_root, css_ext)
+    compress_js_and_css.CompressCss(css_list)
+
+
+def Prepare(app_info, compressor):
+  """Copy the Android template project to a new app project
+     named app_info.app_name
+  """
+  # create new app_dir in temp dir
+  app_name = app_info.android_name
+  app_dir = GetBuildDir(app_name)
+  app_package = app_info.package
+  app_root = app_info.app_root
+  template_app_dir = os.path.join(xwalk_dir, TEMPLATE_DIR_NAME)
+
+  # 1) copy template project to app_dir
+  CleanDir(app_dir)
+  if not os.path.isdir(template_app_dir):
+    print('Error: The template directory could not be found (%s).' %
+          template_app_dir)
     sys.exit(7)
-  root_path =  os.path.join(sanitized_name, 'src',
-                            package.replace('.', os.path.sep))
-  if not os.path.exists(root_path):
-    os.makedirs(root_path)
-  dest_activity = sanitized_name + 'Activity.java'
-  shutil.copyfile(src_activity, os.path.join(root_path, dest_activity))
+  shutil.copytree(template_app_dir, app_dir)
+
+  # 2) replace app_dir 'src' dir with template 'src' dir
+  CleanDir(os.path.join(app_dir, 'src'))
+  template_src_root = os.path.join(template_app_dir, 'src', 'org', 'xwalk',
+                                   'app', 'template')
+
+  # 3) Create directory tree from app package (org.xyz.foo -> src/org/xyz/foo)
+  #    and copy AppTemplateActivity.java to <app_name>Activity.java
+  template_activity_file = os.path.join(template_src_root,
+                                        'AppTemplateActivity.java')
+  if not os.path.isfile(template_activity_file):
+    print ('Error: The template file %s was not found. '
+           'Please make sure this file exists.' % template_activity_file)
+    sys.exit(7)
+  app_pkg_dir = os.path.join(app_dir, 'src',
+                             app_package.replace('.', os.path.sep))
+  if not os.path.exists(app_pkg_dir):
+    os.makedirs(app_pkg_dir)
+  app_activity_file = app_name + 'Activity.java'
+  shutil.copyfile(template_activity_file,
+                  os.path.join(app_pkg_dir, app_activity_file))
+
+  # 4) Copy all HTML source from app_root to app_dir
   if app_root:
-    assets_path = os.path.join(sanitized_name, 'assets')
-    shutil.rmtree(assets_path)
-    os.makedirs(assets_path)
-    app_src_path = os.path.join(assets_path, 'www')
-    shutil.copytree(app_root, app_src_path)
+    app_assets_dir = os.path.join(app_dir, 'assets', 'www')
+    CleanDir(app_assets_dir)
+    shutil.copytree(app_root, app_assets_dir)
+    if compressor:
+      CompressSourceFiles(app_assets_dir, compressor)
+
 
+def EncodingUnicodeValue(value):
+  try:
+    if isinstance(value, unicode):
+      value = value.encode("utf-8")
+  except NameError:
+    pass
+  return value
 
-def CustomizeStringXML(sanitized_name, description):
-  strings_path = os.path.join(sanitized_name, 'res', 'values', 'strings.xml')
+
+def CustomizeStringXML(name, description):
+  strings_path = os.path.join(GetBuildDir(name), 'res', 'values',
+                              'strings.xml')
   if not os.path.isfile(strings_path):
     print ('Please make sure strings_xml'
-           ' exists under app_src folder.')
+           ' exists under template folder.')
     sys.exit(6)
 
   if description:
+    description = EncodingUnicodeValue(description)
     xmldoc = minidom.parse(strings_path)
     AddElementAttributeAndText(xmldoc, 'string', 'name', 'description',
                                description)
@@ -76,54 +190,50 @@ def CustomizeStringXML(sanitized_name, description):
     strings_file.close()
 
 
-def CustomizeThemeXML(sanitized_name, fullscreen, launch_screen_img):
-  theme_path = os.path.join(sanitized_name, 'res', 'values', 'theme.xml')
+def CustomizeThemeXML(name, fullscreen, manifest):
+  theme_path = os.path.join(GetBuildDir(name), 'res', 'values-v14', 'theme.xml')
   if not os.path.isfile(theme_path):
     print('Error: theme.xml is missing in the build tool.')
     sys.exit(6)
 
-  xmldoc = minidom.parse(theme_path)
+  theme_xmldoc = minidom.parse(theme_path)
   if fullscreen:
-    EditElementValueByNodeName(xmldoc, 'item',
+    EditElementValueByNodeName(theme_xmldoc, 'item',
                                'android:windowFullscreen', 'true')
-  if launch_screen_img:
-    EditElementValueByNodeName(xmldoc, 'item',
+  has_background = CustomizeLaunchScreen(manifest, name)
+  if has_background:
+    EditElementValueByNodeName(theme_xmldoc, 'item',
                                'android:windowBackground',
-                               '@drawable/launchscreen')
-    default_image = launch_screen_img
-    if os.path.isfile(default_image):
-      drawable_path = os.path.join(sanitized_name, 'res', 'drawable')
-      if not os.path.exists(drawable_path):
-        os.makedirs(drawable_path)
-      # Get the extension of default_image.
-      # Need to take care of special case, such as 'img.9.png'
-      name = os.path.basename(default_image)
-      extlist = name.split('.')
-      # Remove the file name from the list.
-      extlist.pop(0)
-      ext = '.' + '.'.join(extlist)
-      final_launch_screen_path = os.path.join(drawable_path,
-                                              'launchscreen' + ext)
-      shutil.copyfile(default_image, final_launch_screen_path)
-    else:
-      print('Error: Please make sure \"' + default_image + '\" exists!')
-      sys.exit(6)
+                               '@drawable/launchscreen_bg')
   theme_file = open(theme_path, 'w')
-  xmldoc.writexml(theme_file, encoding='utf-8')
+  theme_xmldoc.writexml(theme_file, encoding='utf-8')
   theme_file.close()
 
 
-def CustomizeXML(sanitized_name, package, app_versionCode, app_version,
-                 description, name, orientation, icon, fullscreen,
-                 launch_screen_img, permissions):
-  manifest_path = os.path.join(sanitized_name, 'AndroidManifest.xml')
+def CustomizeXML(app_info, description, icon_dict, manifest, permissions):
+  app_version = app_info.app_version
+  app_versionCode = app_info.app_versionCode
+  name = app_info.android_name
+  orientation = app_info.orientation
+  package = app_info.package
+  app_name = app_info.app_name
+  app_dir = GetBuildDir(name)
+  # Chinese character with unicode get from 'manifest.json' will cause
+  # 'UnicodeEncodeError' when finally wrote to 'AndroidManifest.xml'.
+  app_name = EncodingUnicodeValue(app_name)
+  # If string start with '@' or '?', it will be treated as Android resource,
+  # which will cause 'No resource found' error,
+  # append a space before '@' or '?' to fix that.
+  if app_name.startswith('@') or app_name.startswith('?'):
+    app_name = ' ' + app_name
+  manifest_path = os.path.join(app_dir, 'AndroidManifest.xml')
   if not os.path.isfile(manifest_path):
     print ('Please make sure AndroidManifest.xml'
-           ' exists under app_src folder.')
+           ' exists under template folder.')
     sys.exit(6)
 
-  CustomizeStringXML(sanitized_name, description)
-  CustomizeThemeXML(sanitized_name, fullscreen, launch_screen_img)
+  CustomizeStringXML(name, description)
+  CustomizeThemeXML(name, app_info.fullscreen_flag, manifest)
   xmldoc = minidom.parse(manifest_path)
   EditElementAttribute(xmldoc, 'manifest', 'package', package)
   if app_versionCode:
@@ -136,28 +246,19 @@ def CustomizeXML(sanitized_name, package, app_versionCode, app_version,
     EditElementAttribute(xmldoc, 'manifest', 'android:description',
                          "@string/description")
   HandlePermissions(permissions, xmldoc)
-  EditElementAttribute(xmldoc, 'application', 'android:label', name)
-  activity_name = package + '.' + sanitized_name + 'Activity'
+  EditElementAttribute(xmldoc, 'application', 'android:label', app_name)
+  activity_name = package + '.' + name + 'Activity'
   EditElementAttribute(xmldoc, 'activity', 'android:name', activity_name)
-  EditElementAttribute(xmldoc, 'activity', 'android:label', name)
+  EditElementAttribute(xmldoc, 'activity', 'android:label', app_name)
   if orientation:
     EditElementAttribute(xmldoc, 'activity', 'android:screenOrientation',
                          orientation)
-  if icon and os.path.isfile(icon):
-    drawable_path = os.path.join(sanitized_name, 'res', 'drawable')
-    if not os.path.exists(drawable_path):
-      os.makedirs(drawable_path)
-    icon_file = os.path.basename(icon)
-    icon_file = ReplaceInvalidChars(icon_file)
-    shutil.copyfile(icon, os.path.join(drawable_path, icon_file))
-    icon_name = os.path.splitext(icon_file)[0]
-    EditElementAttribute(xmldoc, 'application',
-                         'android:icon', '@drawable/%s' % icon_name)
-  elif icon and (not os.path.isfile(icon)):
-    print ('Please make sure the icon file does exist!')
-    sys.exit(6)
+  icon_name = CustomizeIcon(name, app_info.app_root, app_info.icon, icon_dict)
+  if icon_name:
+    EditElementAttribute(xmldoc, 'application', 'android:icon',
+                         '@drawable/%s' % icon_name)
 
-  file_handle = open(os.path.join(sanitized_name, 'AndroidManifest.xml'), 'w')
+  file_handle = open(os.path.join(app_dir, 'AndroidManifest.xml'), 'w')
   xmldoc.writexml(file_handle, encoding='utf-8')
   file_handle.close()
 
@@ -172,27 +273,28 @@ def ReplaceString(file_path, src, dest):
   file_handle.close()
 
 
-def SetVariable(file_path, variable, value):
+def SetVariable(file_path, string_line, variable, value):
   function_string = ('%sset%s(%s);\n' %
-                    ('        ', variable, value))
+                     ('        ', variable, value))
   temp_file_path = file_path + '.backup'
   file_handle = open(temp_file_path, 'w+')
   for line in open(file_path):
     file_handle.write(line)
-    if (line.find('public void onCreate(Bundle savedInstanceState)') >= 0):
+    if (line.find(string_line) >= 0):
       file_handle.write(function_string)
   file_handle.close()
   shutil.move(temp_file_path, file_path)
 
 
-def CustomizeJava(sanitized_name, package, app_url, app_local_path,
-                  enable_remote_debugging):
-  root_path =  os.path.join(sanitized_name, 'src',
-                            package.replace('.', os.path.sep))
-  dest_activity = os.path.join(root_path, sanitized_name + 'Activity.java')
+def CustomizeJava(app_info, app_url, app_local_path, keep_screen_on):
+  name = app_info.android_name
+  package = app_info.package
+  app_dir = GetBuildDir(name)
+  app_pkg_dir = os.path.join(app_dir, 'src', package.replace('.', os.path.sep))
+  dest_activity = os.path.join(app_pkg_dir, name + 'Activity.java')
   ReplaceString(dest_activity, 'org.xwalk.app.template', package)
-  ReplaceString(dest_activity, 'AppTemplate', sanitized_name)
-  manifest_file = os.path.join(sanitized_name, 'assets/www', 'manifest.json')
+  ReplaceString(dest_activity, 'AppTemplate', name)
+  manifest_file = os.path.join(app_dir, 'assets', 'www', 'manifest.json')
   if os.path.isfile(manifest_file):
     ReplaceString(
         dest_activity,
@@ -204,8 +306,7 @@ def CustomizeJava(sanitized_name, package, app_url, app_local_path,
         ReplaceString(dest_activity, 'file:///android_asset/www/index.html',
                       app_url)
     elif app_local_path:
-      if os.path.isfile(os.path.join(sanitized_name, 'assets/www',
-                                     app_local_path)):
+      if os.path.isfile(os.path.join(app_dir, 'assets', 'www', app_local_path)):
         ReplaceString(dest_activity, 'file:///android_asset/www/index.html',
                       'app://' + package + '/' + app_local_path)
       else:
@@ -213,8 +314,24 @@ def CustomizeJava(sanitized_name, package, app_url, app_local_path,
                ' is correct.')
         sys.exit(8)
 
-  if enable_remote_debugging:
-    SetVariable(dest_activity, 'RemoteDebugging', 'true')
+  if app_info.remote_debugging:
+    SetVariable(dest_activity,
+                'public void onCreate(Bundle savedInstanceState)',
+                'RemoteDebugging', 'true')
+  if app_info.use_animatable_view:
+    SetVariable(dest_activity,
+                'public void onCreate(Bundle savedInstanceState)',
+                'UseAnimatableView', 'true')
+  if app_info.fullscreen_flag:
+    SetVariable(dest_activity,
+                'super.onCreate(savedInstanceState)',
+                'IsFullscreen', 'true')
+  if keep_screen_on:
+    ReplaceString(
+        dest_activity,
+        'super.onCreate(savedInstanceState);',
+        'super.onCreate(savedInstanceState);\n        ' +
+        'getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);')
 
 
 def CopyExtensionFile(extension_name, suffix, src_path, dest_path):
@@ -222,7 +339,7 @@ def CopyExtensionFile(extension_name, suffix, src_path, dest_path):
   dest_extension_path = os.path.join(dest_path, extension_name)
   if os.path.exists(dest_extension_path):
     # TODO: Refine it by renaming it internally.
-    print('Error: duplicated extension names "%s" are found. Please rename it.'
+    print('Error: duplicate extension names were found (%s). Please rename it.'
           % extension_name)
     sys.exit(9)
   else:
@@ -232,13 +349,13 @@ def CopyExtensionFile(extension_name, suffix, src_path, dest_path):
   src_file = os.path.join(src_path, file_name)
   dest_file = os.path.join(dest_extension_path, file_name)
   if not os.path.isfile(src_file):
+    print('Error: %s was not found in %s.' % (file_name, src_path))
     sys.exit(9)
-    print('Error: %s is not found in %s.' % (file_name, src_path))
   else:
     shutil.copyfile(src_file, dest_file)
 
 
-def CustomizeExtensions(sanitized_name, name, extensions):
+def CustomizeExtensions(app_info, extensions):
   """Copy the files from external extensions and merge them into APK.
 
   The directory of one external extension should be like:
@@ -256,12 +373,13 @@ def CustomizeExtensions(sanitized_name, name, extensions):
   """
   if not extensions:
     return
-  apk_path = name
-  apk_assets_path = os.path.join(apk_path, 'assets')
+  name = app_info.android_name
+  app_dir = GetBuildDir(name)
+  apk_assets_path = os.path.join(app_dir, 'assets')
   extensions_string = 'xwalk-extensions'
 
   # Set up the target directories and files.
-  dest_jar_path = os.path.join(apk_path, extensions_string)
+  dest_jar_path = os.path.join(app_dir, extensions_string)
   os.mkdir(dest_jar_path)
   dest_js_path = os.path.join(apk_assets_path, extensions_string)
   os.mkdir(dest_js_path)
@@ -273,7 +391,7 @@ def CustomizeExtensions(sanitized_name, name, extensions):
   extension_json_list = []
   for source_path in extension_paths:
     if not os.path.exists(source_path):
-      print('Error: can\'t find the extension directory \'%s\'.' % source_path)
+      print('Error: can not find the extension directory \'%s\'.' % source_path)
       sys.exit(9)
     # Remove redundant separators to avoid empty basename.
     source_path = os.path.normpath(source_path)
@@ -289,16 +407,17 @@ def CustomizeExtensions(sanitized_name, name, extensions):
     file_name = extension_name + '.json'
     src_file = os.path.join(source_path, file_name)
     if not os.path.isfile(src_file):
-      print('Error: %s is not found in %s.' % (file_name, source_path))
+      print('Error: %s was not found in %s.' % (file_name, source_path))
       sys.exit(9)
     else:
-      src_file_handle = file(src_file)
+      src_file_handle = open(src_file)
       src_file_content = src_file_handle.read()
       json_output = json.JSONDecoder().decode(src_file_content)
       # Below 3 properties are used by runtime. See extension manager.
       # And 'permissions' will be merged.
-      if ((not 'name' in json_output) or (not 'class' in json_output)
-          or (not 'jsapi' in json_output)):
+      if not ('name' in json_output and
+              'class' in json_output and
+              'jsapi' in json_output):
         print ('Error: properties \'name\', \'class\' and \'jsapi\' in a json '
                'file are mandatory.')
         sys.exit(9)
@@ -307,7 +426,7 @@ def CustomizeExtensions(sanitized_name, name, extensions):
       json_output['jsapi'] = js_path_prefix + json_output['jsapi']
       extension_json_list.append(json_output)
       # Merge the permissions of extensions into AndroidManifest.xml.
-      manifest_path = os.path.join(sanitized_name, 'AndroidManifest.xml')
+      manifest_path = os.path.join(app_dir, 'AndroidManifest.xml')
       xmldoc = minidom.parse(manifest_path)
       if ('permissions' in json_output):
         # Get used permission list to avoid repetition as "--permissions"
@@ -326,7 +445,7 @@ def CustomizeExtensions(sanitized_name, name, extensions):
 
         # Write to the manifest file to save the update.
         file_handle = open(manifest_path, 'w')
-        xmldoc.writexml(file_handle)
+        xmldoc.writexml(file_handle, encoding='utf-8')
         file_handle.close()
 
   # Write configuration of extensions into the target extensions-config.json.
@@ -337,20 +456,84 @@ def CustomizeExtensions(sanitized_name, name, extensions):
     extension_json_file.close()
 
 
-def CustomizeAll(app_versionCode, description, icon, permissions, app_url,
-                 app_root, app_local_path, enable_remote_debugging,
-                 fullscreen_flag, extensions, launch_screen_img,
-                 package='org.xwalk.app.template', name='AppTemplate',
-                 app_version='1.0.0', orientation='unspecified'):
-  sanitized_name = ReplaceInvalidChars(name, 'apkname')
+def GenerateCommandLineFile(app_info, xwalk_command_line):
+  if xwalk_command_line == '':
+    return
+  assets_path = os.path.join(GetBuildDir(app_info.android_name), 'assets')
+  file_path = os.path.join(assets_path, 'xwalk-command-line')
+  command_line_file = open(file_path, 'w')
+  command_line_file.write('xwalk ' + xwalk_command_line)
+
+
+def CustomizeIconByDict(name, app_root, icon_dict):
+  app_dir = GetBuildDir(name)
+  icon_name = None
+  drawable_dict = {'ldpi': [1, 37], 'mdpi': [37, 72], 'hdpi': [72, 96],
+                   'xhdpi': [96, 120], 'xxhdpi': [120, 144],
+                   'xxxhdpi': [144, 168]}
+  if not icon_dict:
+    return icon_name
+
+  try:
+    icon_dict = dict((int(k), v) for k, v in icon_dict.items())
+  except ValueError:
+    print('The key of icon in the manifest file should be a number.')
+
+  if len(icon_dict) > 0:
+    icon_list = sorted(icon_dict.items(), key=lambda d: d[0])
+    for kd, vd in drawable_dict.items():
+      for item in icon_list:
+        if item[0] >= vd[0] and item[0] < vd[1]:
+          drawable_path = os.path.join(app_dir, 'res', 'drawable-' + kd)
+          if not os.path.exists(drawable_path):
+            os.makedirs(drawable_path)
+          icon = os.path.join(app_root, item[1])
+          if icon and os.path.isfile(icon):
+            icon_name = os.path.basename(icon)
+            icon_suffix = icon_name.split('.')[-1]
+            shutil.copyfile(icon, os.path.join(drawable_path,
+                                               'icon.' + icon_suffix))
+            icon_name = 'icon'
+          elif icon and (not os.path.isfile(icon)):
+            print('Error: "%s" does not exist.' % icon)
+            sys.exit(6)
+          break
+  return icon_name
+
+
+def CustomizeIconByOption(name, icon):
+  if os.path.isfile(icon):
+    drawable_path = os.path.join(GetBuildDir(name), 'res', 'drawable')
+    if not os.path.exists(drawable_path):
+      os.makedirs(drawable_path)
+    icon_file = os.path.basename(icon)
+    icon_file = ReplaceInvalidChars(icon_file)
+    shutil.copyfile(icon, os.path.join(drawable_path, icon_file))
+    icon_name = os.path.splitext(icon_file)[0]
+    return icon_name
+  else:
+    print('Error: "%s" does not exist.' % icon)
+    sys.exit(6)
+
+
+def CustomizeIcon(name, app_root, icon, icon_dict):
+  icon_name = None
+  if icon:
+    icon_name = CustomizeIconByOption(name, icon)
+  else:
+    icon_name = CustomizeIconByDict(name, app_root, icon_dict)
+  return icon_name
+
+
+def CustomizeAll(app_info, description, icon_dict, permissions, app_url,
+                 app_local_path, keep_screen_on, extensions, manifest,
+                 xwalk_command_line='', compressor=None):
   try:
-    Prepare(sanitized_name, package, app_root)
-    CustomizeXML(sanitized_name, package, app_versionCode, app_version,
-                 description, name, orientation, icon, fullscreen_flag,
-                 launch_screen_img, permissions)
-    CustomizeJava(sanitized_name, package, app_url, app_local_path,
-                  enable_remote_debugging)
-    CustomizeExtensions(sanitized_name, name, extensions)
+    Prepare(app_info, compressor)
+    CustomizeXML(app_info, description, icon_dict, manifest, permissions)
+    CustomizeJava(app_info, app_url, app_local_path, keep_screen_on)
+    CustomizeExtensions(app_info, extensions)
+    GenerateCommandLineFile(app_info, xwalk_command_line)
   except SystemExit as ec:
     print('Exiting with error code: %d' % ec.code)
     sys.exit(ec.code)
@@ -370,8 +553,6 @@ def main():
   info = ('The application description. Such as:'
           '--description=YourApplicationdDescription')
   parser.add_option('--description', help=info)
-  info = ('The path of icon. Such as: --icon=/path/to/your/customized/icon')
-  parser.add_option('--icon', help=info)
   info = ('The permission list. Such as: --permissions="geolocation"'
           'For more permissions, such as:'
           '--permissions="geolocation:permission2"')
@@ -390,10 +571,15 @@ def main():
   parser.add_option('--app-local-path', help=info)
   parser.add_option('--enable-remote-debugging', action='store_true',
                     dest='enable_remote_debugging', default=False,
-                    help = 'Enable remote debugging.')
+                    help='Enable remote debugging.')
+  parser.add_option('--use-animatable-view', action='store_true',
+                    dest='use_animatable_view', default=False,
+                    help='Enable using animatable view (TextureView).')
   parser.add_option('-f', '--fullscreen', action='store_true',
                     dest='fullscreen', default=False,
                     help='Make application fullscreen.')
+  parser.add_option('--keep-screen-on', action='store_true', default=False,
+                    help='Support keeping screen on')
   info = ('The path list for external extensions separated by os separator.'
           'On Linux and Mac, the separator is ":". On Windows, it is ";".'
           'Such as: --extensions="/path/to/extension1:/path/to/extension2"')
@@ -404,19 +590,62 @@ def main():
           'http://developer.android.com/guide/topics/manifest/'
           'activity-element.html#screen')
   parser.add_option('--orientation', help=info)
-  parser.add_option('--launch-screen-img',
-                    help='The fallback image for launch_screen')
+  parser.add_option('--manifest', help='The manifest path')
+  info = ('Use command lines.'
+          'Crosswalk is powered by Chromium and supports Chromium command line.'
+          'For example, '
+          '--xwalk-command-line=\'--chromium-command-1 --xwalk-command-2\'')
+  info = ('Create an Android project directory at this location. ')
+  parser.add_option('--project-dir', help=info)
+  parser.add_option('--xwalk-command-line', default='', help=info)
+  info = ('Minify and obfuscate javascript and css.'
+          '--compressor: compress javascript and css.'
+          '--compressor=js: compress javascript.'
+          '--compressor=css: compress css.')
+  parser.add_option('--compressor', dest='compressor', action='callback',
+                    callback=ParseParameterForCompressor,
+                    type='string', nargs=0, help=info)
   options, _ = parser.parse_args()
   try:
-    CustomizeAll(options.app_versionCode, options.description, options.icon,
-                 options.permissions, options.app_url, options.app_root,
-                 options.app_local_path, options.enable_remote_debugging,
-                 options.fullscreen, options.extensions,
-                 options.launch_screen_img, options.package, options.name,
-                 options.app_version, options.orientation)
+    icon_dict = {144: 'icons/icon_144.png',
+                 72: 'icons/icon_72.png',
+                 96: 'icons/icon_96.png',
+                 48: 'icons/icon_48.png'}
+    app_info = AppInfo()
+    if options.name is not None:
+      app_info.android_name = options.name
+    if options.app_root is None:
+      app_info.app_root = os.path.join(xwalk_dir, 'test_data', 'manifest')
+    else:
+      app_info.app_root = options.app_root
+    if options.package is not None:
+      app_info.package = options.package
+    if options.orientation is not None:
+      app_info.orientation = options.orientation
+    if options.app_version is not None:
+      app_info.app_version = options.app_version
+    if options.enable_remote_debugging is not None:
+      app_info.remote_debugging = options.enable_remote_debugging
+    if options.fullscreen is not None:
+      app_info.fullscreen_flag = options.fullscreen
+    app_info.icon = os.path.join('test_data', 'manifest', 'icons',
+                                 'icon_96.png')
+    CustomizeAll(app_info, options.description, icon_dict,
+                 options.permissions, options.app_url, options.app_local_path,
+                 options.keep_screen_on, options.extensions, None,
+                 options.xwalk_command_line, options.compressor)
+
+    # build project is now in /tmp/<name>. Copy to project_dir
+    if options.project_dir:
+      src_dir = GetBuildDir(app_info.android_name)
+      dest_dir = os.path.join(options.project_dir, app_info.android_name)
+      CreateAndCopyDir(src_dir, dest_dir, True)
+
   except SystemExit as ec:
     print('Exiting with error code: %d' % ec.code)
     return ec.code
+  finally:
+    CleanDir(GetBuildDir(app_info.android_name))
   return 0