diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-31 16:36:26 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-31 16:36:26 +0000 |
commit | 149a5a7ba487d2af5effae300c8e6785060fbfc4 (patch) | |
tree | 266268054738dc886a39981bc28633403acc1e86 /build/android | |
parent | bb6ab33c6e87658e52e881d5de8fad24ceac710e (diff) | |
download | chromium_src-149a5a7ba487d2af5effae300c8e6785060fbfc4.zip chromium_src-149a5a7ba487d2af5effae300c8e6785060fbfc4.tar.gz chromium_src-149a5a7ba487d2af5effae300c8e6785060fbfc4.tar.bz2 |
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
Diffstat (limited to 'build/android')
-rw-r--r-- | build/android/ant/create-test-jar.js | 65 |
1 files changed, 0 insertions, 65 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(); |