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

Commit 447d6967 authored by Ying Wang's avatar Ying Wang
Browse files

Clean up Javac a little bit. 

- Added GLOBAL_JAVAC_DEBUG_FLAGS and merge it to
  PRIVATE_JAVACFLAGS/PRIVATE_JACK_FLAGS to get rid of
  PRIVATE_JAVAC_DEBUG_FLAGS/PRIVATE_JACK_DEBUG_FLAGS.
- With Java rules out of base_rules.mk we can get rid
  of java_alternative_checked_module now.

Change-Id: I1a14716c785e3d49330a75044107662ce96a9307
parent e4c753f4

core/base_rules.mk

+0 −2
Original line number Diff line number Diff line
@@ -279,8 +279,6 @@ my_checked_module := 
# checked modules, use LOCAL_BUILT_MODULE.

ifdef LOCAL_CHECKED_MODULE

  my_checked_module := $(LOCAL_CHECKED_MODULE)

else ifdef java_alternative_checked_module

  my_checked_module := $(java_alternative_checked_module)

else

  my_checked_module := $(LOCAL_BUILT_MODULE)

endif

core/combo/javac.mk

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ ifeq ($(CUSTOM_JAVA_COMPILER), eclipse) 
    $(info CUSTOM_JAVA_COMPILER=eclipse)

endif



GLOBAL_JAVAC_DEBUG_FLAGS := -g



HOST_JAVAC ?= $(COMMON_JAVAC)

TARGET_JAVAC ?= $(COMMON_JAVAC)

core/definitions.mk

+0 −3
Original line number Diff line number Diff line
@@ -1734,7 +1734,6 @@ $(hide) tr ' ' '\n' < $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list \ 
    | sort -u > $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq

$(hide) if [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq ] ; then \

    $(1) -encoding UTF-8 \

    $(strip $(PRIVATE_JAVAC_DEBUG_FLAGS)) \

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

    $(2) \

    $(addprefix -classpath ,$(strip \
@@ -1813,7 +1812,6 @@ else \ 
fi; \

$(call call-jack,$(PRIVATE_JACK_VM_ARGS),$(PRIVATE_JACK_EXTRA_ARGS)) \

    $(strip $(PRIVATE_JACK_FLAGS)) \

    $(strip $(PRIVATE_JACK_DEBUG_FLAGS)) \

    $(if $(NO_OPTIMIZE_DX), \

        -D jack.dex.optimize="false") \

    $(if $(PRIVATE_RMTYPEDEFS), \
@@ -1893,7 +1891,6 @@ else \ 
fi; \

$(call call-jack,$(PRIVATE_JACK_VM_ARGS),$(PRIVATE_JACK_EXTRA_ARGS)) \

    $(strip $(PRIVATE_JACK_FLAGS)) \

    $(strip $(PRIVATE_JACK_DEBUG_FLAGS)) \

    $(if $(NO_OPTIMIZE_DX), \

        -D jack.dex.optimize="false") \

    $(addprefix --classpath ,$(strip \

core/host_dalvik_java_library.mk

+5 −8
Original line number Diff line number Diff line
@@ -45,7 +45,9 @@ LOCAL_INTERMEDIATE_TARGETS += \ 
    $(built_dex)



# See comment in java.mk

java_alternative_checked_module := $(full_classes_compiled_jar)

ifndef LOCAL_CHECKED_MODULE

LOCAL_CHECKED_MODULE := $(full_classes_compiled_jar)

endif



#######################################

include $(BUILD_SYSTEM)/base_rules.mk
@@ -56,10 +58,6 @@ all_java_sources := $(java_sources) 


include $(BUILD_SYSTEM)/java_common.mk



$(full_classes_compiled_jar): PRIVATE_JAVAC_DEBUG_FLAGS := -g



java_alternative_checked_module :=



# The layers file allows you to enforce a layering between java packages.

# Run build/tools/java-layers.py for more details.

layers_file := $(addprefix $(LOCAL_PATH)/, $(LOCAL_JAVA_LAYERS_FILE))
@@ -67,7 +65,7 @@ layers_file := $(addprefix $(LOCAL_PATH)/, $(LOCAL_JAVA_LAYERS_FILE)) 
$(cleantarget): PRIVATE_CLEAN_FILES += $(intermediates.COMMON)



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

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

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

$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES :=

$(full_classes_compiled_jar): PRIVATE_JAR_PACKAGES :=

$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_PACKAGES :=
@@ -122,10 +120,9 @@ else 
$(LOCAL_INTERMEDIATE_TARGETS): \

	PRIVATE_JACK_INCREMENTAL_DIR :=

endif

$(LOCAL_INTERMEDIATE_TARGETS):  PRIVATE_JACK_DEBUG_FLAGS := -g



$(built_dex): PRIVATE_CLASSES_JACK := $(full_classes_jack)

$(built_dex): PRIVATE_JACK_FLAGS := $(LOCAL_JACK_FLAGS)

$(built_dex): PRIVATE_JACK_FLAGS := $(GLOBAL_JAVAC_DEBUG_FLAGS) $(LOCAL_JACK_FLAGS)

$(built_dex): $(java_sources) $(java_resource_sources) $(full_jack_lib_deps) \

        $(jar_manifest_file) $(proto_java_sources_file_stamp) $(LOCAL_MODULE_MAKEFILE) \

        $(LOCAL_MODULE_MAKEFILE) $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JACK_JAR) $(JACK_LAUNCHER_JAR)

core/host_dalvik_static_java_library.mk

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ LOCAL_INTERMEDIATE_TARGETS += \ 
include $(BUILD_SYSTEM)/host_java_library.mk

# proguard is not supported

# *.proto files are not supported

$(full_classes_jack): PRIVATE_JACK_FLAGS := $(LOCAL_JACK_FLAGS)

$(full_classes_jack): PRIVATE_JACK_FLAGS := $(GLOBAL_JAVAC_DEBUG_FLAGS) $(LOCAL_JACK_FLAGS)

$(full_classes_jack): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES)

$(full_classes_jack): \

	PRIVATE_JACK_INTERMEDIATES_DIR := $(intermediates.COMMON)/jack-rsc