Remove -debug suffix in apk names.

-debug suffix is used even for Release builds, remove this suffix
now apk name will have no suffix in either Debug or Release builds.

BUG=155946


Review URL: https://chromiumcodereview.appspot.com/11221003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162803 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 13 insertions, 20 deletions

diff --git a/build/android/ant/chromium-apk.xml b/build/android/ant/chromium-apk.xml
index 45c0d3d..6ff1ebc 100644
--- a/build/android/ant/chromium-apk.xml
+++ b/build/android/ant/chromium-apk.xml
@@ -58,7 +58,7 @@
 
   <!-- Set the output directory for the final apk to the ${apks.dir}. -->
   <property-location name="out.final.file"
-      location="${apks.dir}/${ant.project.name}-debug.apk"
+      location="${apks.dir}/${ant.project.name}.apk"
       check-exists="false"/>
 
   <!-- Classpath for javac -->
diff --git a/build/android/ant/create-test-jar.js b/build/android/ant/create-test-jar.js
index 542a89e..d22c003 100644
--- a/build/android/ant/create-test-jar.js
+++ b/build/android/ant/create-test-jar.js
@@ -4,7 +4,7 @@
 
 /**
  * Combines classes from javac.custom.classpath property and ${out.dir}/classes
- * into a single jar file ${ant.project.name}-debug.jar and places the file in
+ * into a single jar file ${ant.project.name}.jar and places the file in
  * ${lib.java.dir}.
  */
 
@@ -26,7 +26,7 @@ var duplicate = Zip.Duplicate();
 duplicate.setValue("preserve");
 jarTask.setDuplicate(duplicate);
 
-var destFile = project.getProperty("ant.project.name") + "-debug.jar";
+var destFile = project.getProperty("ant.project.name") + ".jar";
 var destPath = File(project.getProperty("test.lib.java.dir") + "/" + destFile);
 jarTask.setDestFile(destPath);
 
diff --git a/build/android/ant/sdk-targets.xml b/build/android/ant/sdk-targets.xml
index b692f6e..02b5b29 100644
--- a/build/android/ant/sdk-targets.xml
+++ b/build/android/ant/sdk-targets.xml
@@ -108,7 +108,7 @@
       <if condition="${project.is.testapp}">
         <then>
           <echo level="info">Creating test jar file:
-              ${ant.project.name}-debug.jar</echo>
+              ${ant.project.name}.jar</echo>
           <property-location name="create.test.jar.file"
               location="${CHROMIUM_SRC}/build/android/ant/create-test-jar.js"/>
           <script language="javascript" src="${create.test.jar.file}"/>
@@ -138,9 +138,9 @@
 
   <!-- SDK tools assume that out.packaged.file is signed and name it "...-unaligned" -->
   <property name="out.packaged.file"
-    value="${apks.dir}/${ant.project.name}-debug-unsigned.apk" />
+    value="${apks.dir}/${ant.project.name}-unsigned.apk" />
   <property name="out.unaligned.file"
-    value="${apks.dir}/${ant.project.name}-debug-unaligned.apk" />
+    value="${apks.dir}/${ant.project.name}-unaligned.apk" />
 
   <!-- By default, the SDK tools build only aligns the APK in the -do-debug target. -->
   <target name="-do-debug"
@@ -175,10 +175,6 @@
   <target name="-post-compile">
     <!--
       Copy gdbserver to main libs directory if building a non-instrumentation debug apk.
-      TODO(jrg): For now, Chrome on Android always builds native code
-      as Release and java/ant as Debug, which means we always install
-      gdbserver.  Resolve this discrepancy, possibly by making this
-      Release Official build java/ant as Release.
     -->
     <if>
       <condition>
diff --git a/build/android/buildbot/buildbot_functions.sh b/build/android/buildbot/buildbot_functions.sh
index bc4d942..9fdd137 100755
--- a/build/android/buildbot/buildbot_functions.sh
+++ b/build/android/buildbot/buildbot_functions.sh
@@ -245,11 +245,11 @@ function bb_run_all_instrumentation_tests_for_apk {
 
 # Run instrumentation tests for all relevant APKs on device.
 function bb_run_instrumentation_tests {
-  bb_run_all_instrumentation_tests_for_apk "ContentShell-debug.apk" \
+  bb_run_all_instrumentation_tests_for_apk "ContentShell.apk" \
       "org.chromium.content_shell" "ContentShellTest"
-  bb_run_all_instrumentation_tests_for_apk "ChromiumTestShell-debug.apk" \
+  bb_run_all_instrumentation_tests_for_apk "ChromiumTestShell.apk" \
       "org.chromium.chrome.testshell" "ChromiumTestShellTest"
-  bb_run_all_instrumentation_tests_for_apk "AndroidWebView-debug.apk" \
+  bb_run_all_instrumentation_tests_for_apk "AndroidWebView.apk" \
       "org.chromium.android_webview" "AndroidWebViewTest"
 }
 
diff --git a/build/android/pylib/test_options_parser.py b/build/android/pylib/test_options_parser.py
index ee00f1f..2f47328 100644
--- a/build/android/pylib/test_options_parser.py
+++ b/build/android/pylib/test_options_parser.py
@@ -126,15 +126,14 @@ def ValidateInstrumentationOptions(option_parser, options, args):
   elif options.python_only:
     options.run_java_tests = False
 
-  # In case of SDK Build, the jars and apks have a -debug suffix.
   options.test_apk_path = os.path.join(_SDK_OUT_DIR,
                                        options.build_type,
                                        constants.SDK_BUILD_APKS_DIR,
-                                       '%s-debug.apk' % options.test_apk)
+                                       '%s.apk' % options.test_apk)
   options.test_apk_jar_path = os.path.join(_SDK_OUT_DIR,
                                            options.build_type,
                                            constants.SDK_BUILD_TEST_JAVALIB_DIR,
-                                           '%s-debug.jar' % options.test_apk)
+                                           '%s.jar' % options.test_apk)
   if options.annotation_str:
     options.annotation = options.annotation_str.split()
   elif options.test_filter:
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index cec4137..509dc0e 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -30,7 +30,7 @@
 # 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:
@@ -117,9 +117,7 @@
         }],
       ],
       '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',