diff options
| author | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-26 20:44:29 +0000 |
|---|---|---|
| committer | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-26 20:44:29 +0000 |
| commit | a934b41576c94d457e118e2d59be5e819c76b4f2 (patch) | |
| tree | 96c6880a6898c8c08d9014cff7f8bcfe8019ca5e /build/java.gypi | |
| parent | 6ec269932adcc18b5afca20b4dee1648b5c4466a (diff) | |
| download | chromium_src-a934b41576c94d457e118e2d59be5e819c76b4f2.zip chromium_src-a934b41576c94d457e118e2d59be5e819c76b4f2.tar.gz chromium_src-a934b41576c94d457e118e2d59be5e819c76b4f2.tar.bz2 | |
Translate some ant to python
This moves java compilation, jar, and dex for apks from
ant to python. This uses the same javac.py and jar.py
that are used by build/java.gypi for libraries and introduces a simple dex.py.
BUG=158821
Review URL: https://chromiumcodereview.appspot.com/12880007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190756 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/java.gypi')
| -rw-r--r-- | build/java.gypi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/java.gypi b/build/java.gypi index 1ab72c2..6b0b9a5 100644 --- a/build/java.gypi +++ b/build/java.gypi @@ -56,7 +56,7 @@ 'javac_includes': [], 'jar_name': '<(_target_name).jar', 'jar_path': '<(PRODUCT_DIR)/lib.java/<(jar_name)', - 'excluded_classes': [ '*/R.class', '*/R##*.class' ], + 'jar_excluded_classes': [ '*/R.class', '*/R##*.class' ], 'additional_input_paths': [], 'generated_src_dirs': ['>@(generated_R_dirs)'], 'generated_R_dirs': [], @@ -170,7 +170,7 @@ 'message': 'Compiling <(_target_name) java sources', 'variables': { 'all_src_dirs': [ - '>@(java_in_dir)/src', + '>(java_in_dir)/src', '>@(additional_src_dirs)', '>@(generated_src_dirs)', ], @@ -212,7 +212,7 @@ 'python', '<(DEPTH)/build/android/jar.py', '--classes-dir=<(classes_dir)', '--jar-path=<(jar_path)', - '--excluded-classes=<(excluded_classes)', + '--excluded-classes=<(jar_excluded_classes)', # TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja. '--ignore=>!(echo \'>(_inputs)\' | md5sum)', |