Remove -debug suffix in apk names.

build/java_apk.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file is meant to be included into a target to provide a rule
 # to build Android APKs in a consistent manner.
 #
 # To use this, create a gyp target with the following form:
 # {
 #   'target_name': 'my_package_apk',
@@ skipping 12 matching lines @@
 # java_in_dir="content/shell/android/java" you should have a directory structure
 # like:
 #
 # content/shell/android/java/content_shell_apk.xml
 # content/shell/android/java/src/chromium/base/Foo.java
 # content/shell/android/java/src/chromium/base/Bar.java
 #
 # Required variables:
 #  package_name - Used to name the intermediate output directory and in the
 #    names of some output files.
-#  apk_name - The final apk will be named <apk_name>-debug.apk (or -release)
+#  apk_name - The final apk will be named <apk_name>.apk
 #  java_in_dir - The top-level java directory. The src should be in
 #    <java_in_dir>/src.
 # Optional/automatic variables:
 #  additional_input_paths - These paths will be included in the 'inputs' list to
 #    ensure that this target is rebuilt when one of these paths changes.
 #  additional_src_dirs - Additional directories with .java files to be compiled
 #    and included in the output of this target.
 #  asset_location - The directory where assets are located (default:
 #    <PRODUCT_DIR>/<package_name>/assets).
 #  generated_src_dirs - Same as additional_src_dirs except used for .java files
@@ skipping 66 matching lines @@
         '>@(input_jars_paths)',
         '>@(native_libs_paths)',
         '>@(additional_input_paths)',
       ],
       'conditions': [
         ['resource_dir!=""', {
           'inputs': ['<!@(find <(java_in_dir)/<(resource_dir) -name "*")']
         }],
       ],
       'outputs': [
-        # TODO(cjhopman): Apks are built with a -debug suffix even when they are
-        # built in release. This should be fixed.
-        '<(PRODUCT_DIR)/apks/<(apk_name)-debug.apk',
+        '<(PRODUCT_DIR)/apks/<(apk_name).apk',
       ],
       'action': [
         'ant',
         '-DAPP_ABI=<(android_app_abi)',
         '-DANDROID_GDBSERVER=<(android_gdbserver)',
         '-DANDROID_SDK=<(android_sdk)',
         '-DANDROID_SDK_ROOT=<(android_sdk_root)',
         '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
         '-DANDROID_SDK_VERSION=<(android_sdk_version)',
         '-DANDROID_TOOLCHAIN=<(android_toolchain)',
@@ skipping 17 matching lines @@
         '-buildfile',
         '<(DEPTH)/build/android/ant/chromium-apk.xml',
 
         # Specify CONFIGURATION_NAME as the target for ant to build. The
         # buildfile will then build the appropriate SDK tools target.
         '<(CONFIGURATION_NAME)',
       ]
     },
   ],
 }