Merge "Show annotation information in generated documentation" into lmp-dev
diff --git a/core/Makefile b/core/Makefile
index e3dd7ad..5064886 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1744,6 +1744,9 @@
include $(sort $(wildcard $(BUILD_SYSTEM)/tasks/*.mk))
-include $(sort $(wildcard vendor/*/build/tasks/*.mk))
-include $(sort $(wildcard device/*/build/tasks/*.mk))
+# Also the project-specific tasks
+-include $(sort $(wildcard vendor/*/*/build/tasks/*.mk))
+-include $(sort $(wildcard device/*/*/build/tasks/*.mk))
endif
# -----------------------------------------------------------------
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index ffb6e39..bcadea2 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -612,8 +612,8 @@
opts, args = getopt.getopt(
argv, "hvp:s:x:" + extra_opts,
["help", "verbose", "path=", "signapk_path=", "extra_signapk_args=",
- "java_path=", "public_key_suffix=", "private_key_suffix=",
- "device_specific=", "extra="] +
+ "java_path=", "java_args=", "public_key_suffix=",
+ "private_key_suffix=", "device_specific=", "extra="] +
list(extra_long_opts))
except getopt.GetoptError, err:
Usage(docstring)