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

Commit 0851df8c authored by Colin Cross's avatar Colin Cross
Browse files

Provide make variables for java binaries 

Replace java -> $(JAVA), etc. to prepare for moving java binaries
out of the path and using full paths to them.

Test: builds
Bug: 62956999
Change-Id: I5dfcd0d4e855ecde69cd127169e9545e59723d12
parent b519d002

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1093,7 +1093,7 @@ $(RECOVERY_INSTALL_OTA_KEYS): $(OTA_PUBLIC_KEYS) $(DUMPKEY_JAR) $(extra_keys) 
	@echo "DumpPublicKey: $@ <= $(PRIVATE_OTA_PUBLIC_KEYS) $(extra_keys)"

	@rm -rf $@

	@mkdir -p $(dir $@)

	java -jar $(DUMPKEY_JAR) $(PRIVATE_OTA_PUBLIC_KEYS) $(extra_keys) > $@

	$(JAVA) -jar $(DUMPKEY_JAR) $(PRIVATE_OTA_PUBLIC_KEYS) $(extra_keys) > $@



RECOVERYIMAGE_ID_FILE := $(PRODUCT_OUT)/recovery.id

core/combo/javac.mk

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ else 
JAVACC := $(ALTERNATE_JAVAC)

endif



JAVA := java

JAVADOC := javadoc

JAR := jar



# The actual compiler can be wrapped by setting the JAVAC_WRAPPER var.

ifdef JAVAC_WRAPPER

    ifneq ($(JAVAC_WRAPPER),$(firstword $(JAVACC)))

core/config.mk

+3 −3
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ DX := $(HOST_OUT_EXECUTABLES)/dx 
DX_COMMAND := $(DX) -JXms16M -JXmx2048M

else

DX := $(DX_ALT_JAR)

DX_COMMAND := java -Xms16M -Xmx2048M -jar $(DX)

DX_COMMAND := $(JAVA) -Xms16M -Xmx2048M -jar $(DX)

endif



MAINDEXCLASSES := $(HOST_OUT_EXECUTABLES)/mainDexClasses
@@ -676,7 +676,7 @@ FINDBUGS := $(FINDBUGS_DIR)/findbugs 
EMMA_JAR := external/emma/lib/emma$(COMMON_JAVA_PACKAGE_SUFFIX)



# Tool to merge AndroidManifest.xmls

ANDROID_MANIFEST_MERGER := java -classpath prebuilts/devtools/tools/lib/manifest-merger.jar com.android.manifmerger.Main merge

ANDROID_MANIFEST_MERGER := $(JAVA) -classpath prebuilts/devtools/tools/lib/manifest-merger.jar com.android.manifmerger.Main merge



COLUMN:= column
@@ -700,7 +700,7 @@ endif # ifeq ($(EXPERIMENTAL_USE_OPENJDK9),) 


# Is the host JDK 64-bit version?

HOST_JDK_IS_64BIT_VERSION :=

ifneq ($(filter 64-Bit, $(shell java -version 2>&1)),)

ifneq ($(filter 64-Bit, $(shell $(JAVA) -version 2>&1)),)

HOST_JDK_IS_64BIT_VERSION := true

endif

endif  # CALLED_FROM_SETUP not true

core/definitions.mk

+8 −8
Original line number Diff line number Diff line
@@ -2243,9 +2243,9 @@ $(if $(PRIVATE_JAR_EXCLUDE_PACKAGES), $(hide) rm -rf \ 
$(if $(PRIVATE_JAR_MANIFEST), \

    $(hide) sed -e "s/%BUILD_NUMBER%/$(BUILD_NUMBER_FROM_FILE)/" \

            $(PRIVATE_JAR_MANIFEST) > $(dir $@)/manifest.mf && \

        jar -cfm $@ $(dir $@)/manifest.mf \

        $(JAR) -cfm $@ $(dir $@)/manifest.mf \

            -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) ., \

    $(hide) jar -cf $@ -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) .)

    $(hide) $(JAR) -cf $@ -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) .)

$(if $(PRIVATE_EXTRA_JAR_ARGS),$(call add-java-resources-to,$@))

endef
@@ -2516,7 +2516,7 @@ $(if $(PRIVATE_JAR_MANIFEST), $(hide) echo unsupported options JAR_MANIFEST in $ 
endef



define transform-classes.jar-to-emma

$(hide) java -classpath $(EMMA_JAR) emma instr -outmode fullcopy -outfile \

$(hide) $(JAVA) -classpath $(EMMA_JAR) emma instr -outmode fullcopy -outfile \

    $(PRIVATE_EMMA_COVERAGE_FILE) -ip $< -d $(PRIVATE_EMMA_INTERMEDIATES_DIR) \

    $(addprefix -ix , $(PRIVATE_EMMA_COVERAGE_FILTER))

endef
@@ -2539,7 +2539,7 @@ define desugar-classes-jar 
$(hide) rm -f $@ $@.tmp

@rm -rf $(dir $@)/desugar_dumped_classes

@mkdir $(dir $@)/desugar_dumped_classes

$(hide) java \

$(hide) $(JAVA) \

    $(if $(EXPERIMENTAL_USE_OPENJDK9),--add-opens java.base/java.lang.invoke=ALL-UNNAMED,) \

    -Djdk.internal.lambda.dumpProxyClasses=$(abspath $(dir $@))/desugar_dumped_classes \

    -jar $(DESUGAR) \
@@ -2577,7 +2577,7 @@ endef 
define create-empty-package-at

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

$(hide) touch $(dir $(1))zipdummy

$(hide) (cd $(dir $(1)) && jar cf $(notdir $(1)) zipdummy)

$(hide) $(JAR) cf $(1) -C $(dir $(1)) zipdummy

$(hide) zip -qd $(1) zipdummy

$(hide) rm $(dir $(1))zipdummy

endef
@@ -2671,7 +2671,7 @@ endef 
#

define add-java-resources-to

$(call dump-words-to-file, $(PRIVATE_EXTRA_JAR_ARGS), $(1).jar-arg-list)

$(hide) jar uf $(1) @$(1).jar-arg-list

$(hide) $(JAR) uf $(1) @$(1).jar-arg-list

@rm -f $(1).jar-arg-list

endef
@@ -2683,7 +2683,7 @@ define add-carried-jack-resources 
        | sed -e "s?^$(PRIVATE_JACK_INTERMEDIATES_DIR)/? -C \"$(PRIVATE_JACK_INTERMEDIATES_DIR)\" \"?" -e "s/$$/\"/" \

        > $(dir $@)jack_res_jar_flags; \

    if [ -s $(dir $@)jack_res_jar_flags ] ; then \

        jar uf $@ @$(dir $@)jack_res_jar_flags; \

        $(JAR) uf $@ @$(dir $@)jack_res_jar_flags; \

    fi; \

fi

endef
@@ -2698,7 +2698,7 @@ endef 
# $(1): the package file we are signing.

define sign-package-arg

$(hide) mv $(1) $(1).unsigned

$(hide) java -Djava.library.path=$(SIGNAPK_JNI_LIBRARY_PATH) \

$(hide) $(JAVA) -Djava.library.path=$(SIGNAPK_JNI_LIBRARY_PATH) \

    $(if $(EXPERIMENTAL_USE_OPENJDK9),--add-exports java.base/sun.security.pkcs=ALL-UNNAMED,) \

    $(if $(EXPERIMENTAL_USE_OPENJDK9),--add-exports java.base/sun.security.x509=ALL-UNNAMED,) \

    -jar $(SIGNAPK_JAR) \

core/droiddoc.mk

+2 −2
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ $(full_target): \ 
	$(call prepare-doc-source-list,$(PRIVATE_SRC_LIST_FILE),$(PRIVATE_JAVA_FILES), \

			$(PRIVATE_SOURCE_INTERMEDIATES_DIR) $(PRIVATE_ADDITIONAL_JAVA_DIR))

	$(hide) ( \

		javadoc \

		$(JAVADOC) \

                -encoding UTF-8 \

                -source 1.8 \

                \@$(PRIVATE_SRC_LIST_FILE) \
@@ -216,7 +216,7 @@ $(full_target): $(full_src_files) $(full_java_lib_deps) 
	$(call prepare-doc-source-list,$(PRIVATE_SRC_LIST_FILE),$(PRIVATE_JAVA_FILES), \

			$(PRIVATE_SOURCE_INTERMEDIATES_DIR) $(PRIVATE_ADDITIONAL_JAVA_DIR))

	$(hide) ( \

		javadoc \

		$(JAVADOC) \

                -encoding UTF-8 \

                $(PRIVATE_DROIDDOC_OPTIONS) \

                \@$(PRIVATE_SRC_LIST_FILE) \