Index: build/java.gypi |
diff --git a/build/java.gypi b/build/java.gypi |
index 2758cd17256b7567e418c86aa1a595f2dcd70082..67c3fd5bb929e79feb7063e4d9939b8055d1a1e8 100644 |
--- a/build/java.gypi |
+++ b/build/java.gypi |
@@ -52,7 +52,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': ['>@(additional_R_files)'], |
'generated_src_dirs': ['>@(generated_R_dirs)'], |
'generated_R_dirs': [], |
@@ -158,7 +158,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)', |
], |
@@ -200,7 +200,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)', |