android: Stop passing defines to apk-obfuscate.xml which it ignores.

Most of these are leftovers from when apk-obfuscate.xml was moved to its
own file in https://chromiumcodereview.appspot.com/12880007

CREATE_TEST_JAR_PATH was removed in
https://codereview.chromium.org/35473002

No intended behavior change.

BUG=none
NOTRY=true

Review URL: https://codereview.chromium.org/212943003

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

2 files changed, 1 insertions, 71 deletions

diff --git a/build/android/ant/create-test-jar.js b/build/android/ant/create-test-jar.js
deleted file mode 100644
index 855b47e..0000000
--- a/build/android/ant/create-test-jar.js
+++ /dev/null
@@ -1,65 +0,0 @@
-// 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.
-
-/**
- * Combines classes from javac.custom.classpath property and ${out.dir}/classes
- * into a single jar file ${ant.project.name}.jar and places the file in
- * ${lib.java.dir}.
- */
-
-importClass(java.io.File);
-importClass(org.apache.tools.ant.types.Reference);
-importClass(org.apache.tools.ant.types.FileSet);
-importClass(org.apache.tools.ant.types.ZipFileSet);
-importClass(org.apache.tools.ant.taskdefs.Zip);
-
-var jarTask = project.createTask("jar");
-
-// Do not allow duplicates in the jar, the default behavior of Jar task
-// is "add" which means duplicates are allowed.
-// This can cause a class file to be included multiple times, setting the
-// duplicate to "preserve" ensures that only the first definition is included.
-
-var duplicate = Zip.Duplicate();
-duplicate.setValue("preserve");
-jarTask.setDuplicate(duplicate);
-
-var destPath = File(project.getProperty("TEST_JAR_PATH"));
-jarTask.setDestFile(destPath);
-
-// Include all the jars in the classpath.
-var javacCustomClasspath =
-    project.getReference("javac.custom.classpath").list();
-
-for (var i in javacCustomClasspath) {
-  var fileName = javacCustomClasspath[i]
-  var fileExtension = fileName.split("\\.").pop();
-  if(fileExtension == "jar")
-  {
-    var zipFileSet = ZipFileSet();
-    zipFileSet.setIncludes("**/*.class");
-    zipFileSet.setSrc(File(fileName));
-    jarTask.addFileset(zipFileSet);
-  }
-}
-
-// Add the compiled classes in ${out.dir}/classes.
-var projectClasses = FileSet();
-projectClasses.setIncludes("**/*.class");
-projectClasses.setDir(File(project.getProperty("out.dir") + "/classes"));
-jarTask.addFileset(projectClasses);
-
-// Exclude manifest and resource classes.
-var appPackagePath =
-    (project.getProperty("project.app.package")).replace('.','/');
-var excludedClasses = ["R.class", "R$*.class", "Manifest.class",
-    "Manifest$*.class", "BuildConfig.class"]
-
-var exclusionString = "";
-for (var i in excludedClasses) {
-  exclusionString += appPackagePath+ "/" + excludedClasses[i] + " ";
-}
-
-jarTask.setExcludes(exclusionString);
-jarTask.perform();
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index ccfd9af..8512810 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -153,7 +153,7 @@
   # cannot be lifted in a dependent to all_dependent_settings.
   'all_dependent_settings': {
     'variables': {
-      'apk_output_jar_path': '<(PRODUCT_DIR)/lib.java/<(jar_name)',
+      'apk_output_jar_path': '<(jar_path)',
     },
   },
   'conditions': [
@@ -614,7 +614,6 @@
       'message': 'Obfuscating <(_target_name)',
       'inputs': [
         '<(DEPTH)/build/android/ant/apk-obfuscate.xml',
-        '<(DEPTH)/build/android/ant/create-test-jar.js',
         '<(DEPTH)/build/android/gyp/util/build_utils.py',
         '<(DEPTH)/build/android/gyp/ant.py',
         '<(android_manifest_path)',
@@ -629,19 +628,15 @@
       'action': [
         'python', '<(DEPTH)/build/android/gyp/ant.py',
         '-quiet',
-        '-DADDITIONAL_SRC_DIRS=>(additional_src_dirs)',
         '-DANDROID_MANIFEST=<(android_manifest_path)',
         '-DANDROID_SDK_JAR=<(android_sdk_jar)',
         '-DANDROID_SDK_ROOT=<(android_sdk_root)',
         '-DANDROID_SDK_VERSION=<(android_sdk_version)',
         '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
         '-DAPK_NAME=<(apk_name)',
-        '-DCREATE_TEST_JAR_PATH=<(DEPTH)/build/android/ant/create-test-jar.js',
         '-DCONFIGURATION_NAME=<(CONFIGURATION_NAME)',
-        '-DGENERATED_SRC_DIRS=>(generated_src_dirs)',
         '-DINPUT_JARS_PATHS=>(input_jars_paths)',
         '-DIS_TEST_APK=<(is_test_apk)',
-        '-DJAR_PATH=<(PRODUCT_DIR)/lib.java/<(jar_name)',
         '-DOBFUSCATED_JAR_PATH=<(obfuscated_jar_path)',
         '-DOUT_DIR=<(intermediate_dir)',
         '-DPROGUARD_ENABLED=<(proguard_enabled)',