Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f8767e5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic 'anno' 

* changes:
  Support java annotation proccessors
  Add support for LOCAL_ERROR_PRONE_FLAGS
parents 2d6e79d2 cde14987

core/build-system.html

+16 −0
Original line number Diff line number Diff line
@@ -592,6 +592,17 @@ alphabetically.</p> 
</ul>

</p>



<h4>LOCAL_ANNOTATION_PROCESSORS</h4>

<p>Set this to a list of modules built with <code>BUILD_HOST_JAVA_LIBRARY</code>

to have their jars passed to javac with -processorpath for use as annotation

processors.</p>



<h4>LOCAL_ANNOTATION_PROCESSOR_CLASSES</h4>

<p>Set this to a list of classes to be passed to javac as -processor arguments.

This list is would be unnecessary, as javac will autodetect annotation processor

classes, except that the Grok tool that is used on the Android source code

does not autodetect them and requires listing them manually.</p>



<h4>LOCAL_ASSET_FILES</h4>

<p>In Android.mk files that <code>include $(BUILD_PACKAGE)</code> set this

to the set of files you want built into your app.  Usually:</p>
@@ -707,6 +718,11 @@ example.</p> 
them here.  For example:</p>

<p><code>LOCAL_JAVACFLAGS += -Xlint:deprecation</code></p>



<h4>LOCAL_ERROR_PRONE_FLAGS</h4>

<p>If you have additional flags to pass into the error prone compiler, add

them here.  For example:</p>

<p><code>LOCAL_ERROR_PRONE_FLAGS += -Xep:ClassCanBeStatic:ERROR</code></p>



<h4>LOCAL_JAVA_LIBRARIES</h4>

<p>When linking Java apps and libraries, <code>LOCAL_JAVA_LIBRARIES</code>

specifies which sets of java classes to include.  Currently there are

core/clear_vars.mk

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ LOCAL_ADDITIONAL_HTML_DIR:= 
LOCAL_ADDITIONAL_JAVA_DIR:=

LOCAL_AIDL_INCLUDES:=

LOCAL_ALLOW_UNDEFINED_SYMBOLS:=

LOCAL_ANNOTATION_PROCESSORS:=

LOCAL_ANNOTATION_PROCESSOR_CLASSES:=

LOCAL_APK_LIBRARIES:=

LOCAL_ARM_MODE:=

LOCAL_ASFLAGS:=
@@ -68,6 +70,7 @@ LOCAL_DROIDDOC_USE_STANDARD_DOCLET:= 
LOCAL_DX_FLAGS:=

LOCAL_EMMA_COVERAGE_FILTER:=

LOCAL_EMMA_INSTRUMENT:=

LOCAL_ERROR_PRONE_FLAGS:=

LOCAL_EXPORT_CFLAGS:=

LOCAL_EXPORT_C_INCLUDE_DEPS:=

LOCAL_EXPORT_C_INCLUDE_DIRS:=

core/definitions.mk

+4 −4
Original line number Diff line number Diff line
@@ -2188,9 +2188,9 @@ endef 
# $(2): bootclasspath

define compile-java

$(hide) rm -f $@

$(hide) rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR)

$(hide) rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) $(PRIVATE_ANNO_INTERMEDIATES_DIR)

$(hide) mkdir -p $(dir $@)

$(hide) mkdir -p $(PRIVATE_CLASS_INTERMEDIATES_DIR)

$(hide) mkdir -p $(PRIVATE_CLASS_INTERMEDIATES_DIR) $(PRIVATE_ANNO_INTERMEDIATES_DIR)

$(call unzip-jar-files,$(PRIVATE_STATIC_JAVA_LIBRARIES),$(PRIVATE_CLASS_INTERMEDIATES_DIR))

$(call dump-words-to-file,$(PRIVATE_JAVA_SOURCES),$(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list)

$(hide) if [ -d "$(PRIVATE_SOURCE_INTERMEDIATES_DIR)" ]; then \
@@ -2209,7 +2209,7 @@ $(hide) if [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq ] ; the 
    $(addprefix -classpath ,$(strip \

        $(call normalize-path-list,$(PRIVATE_ALL_JAVA_LIBRARIES)))) \

    $(if $(findstring true,$(PRIVATE_WARNINGS_ENABLE)),$(xlint_unchecked),) \

    -extdirs "" -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) \

    -extdirs "" -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) -s $(PRIVATE_ANNO_INTERMEDIATES_DIR) \

    $(PRIVATE_JAVACFLAGS) \

    \@$(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq \

    || ( rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) ; exit 41 ) \

core/host_dalvik_java_library.mk

+2 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ $(cleantarget): PRIVATE_CLEAN_FILES += $(intermediates.COMMON) 
ifndef LOCAL_JACK_ENABLED



$(full_classes_compiled_jar): PRIVATE_JAVA_LAYERS_FILE := $(layers_file)

$(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(GLOBAL_JAVAC_DEBUG_FLAGS) $(LOCAL_JAVACFLAGS)

$(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(GLOBAL_JAVAC_DEBUG_FLAGS) $(LOCAL_JAVACFLAGS) $(annotation_processor_flags)

$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES :=

$(full_classes_compiled_jar): PRIVATE_JAR_PACKAGES :=

$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_PACKAGES :=
@@ -96,6 +96,7 @@ $(full_classes_compiled_jar): \ 
        $(full_java_lib_deps) \

        $(jar_manifest_file) \

        $(proto_java_sources_file_stamp) \

        $(annotation_processor_deps) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES)

	$(transform-host-java-to-package)

core/host_java_library.mk

+7 −1
Original line number Diff line number Diff line
@@ -58,8 +58,13 @@ include $(BUILD_SYSTEM)/java_common.mk 
# Run build/tools/java-layers.py for more details.

layers_file := $(addprefix $(LOCAL_PATH)/, $(LOCAL_JAVA_LAYERS_FILE))



# If error prone is enabled then add LOCAL_ERROR_PRONE_FLAGS to LOCAL_JAVACFLAGS

ifeq ($(RUN_ERROR_PRONE),true)

LOCAL_JAVACFLAGS += $(LOCAL_ERROR_PRONE_FLAGS)

endif



$(full_classes_compiled_jar): PRIVATE_JAVA_LAYERS_FILE := $(layers_file)

$(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(GLOBAL_JAVAC_DEBUG_FLAGS) $(LOCAL_JAVACFLAGS)

$(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(GLOBAL_JAVAC_DEBUG_FLAGS) $(LOCAL_JAVACFLAGS) $(annotation_processor_flags)

$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES :=

$(full_classes_compiled_jar): PRIVATE_JAR_PACKAGES :=

$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_PACKAGES :=
@@ -69,6 +74,7 @@ $(full_classes_compiled_jar): \ 
        $(full_java_lib_deps) \

        $(jar_manifest_file) \

        $(proto_java_sources_file_stamp) \

        $(annotation_processor_deps) \

        $(NORMALIZE_PATH) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES)

	$(transform-host-java-to-package)