Merge "brillo: Remove dependency on java for Brillo" (6c8e3e41) · Commits · e / os / android_build

core/main.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,9 @@ TOPDIR :=

		BUILD_SYSTEM := $(TOPDIR)build/core

		# Ensure JAVA_NOT_REQUIRED is not set externally.
		JAVA_NOT_REQUIRED := false

		# This is the default target. It must be the first declared target.
		.PHONY: droid
		DEFAULT_GOAL := droid
		@@ -177,6 +180,7 @@ $(warning ************************************************************)
		$(error Directory names containing spaces not supported)
		endif

		ifeq ($(JAVA_NOT_REQUIRED), false)
		java_version_str := $(shell unset _JAVA_OPTIONS && java -version 2>&1)
		javac_version_str := $(shell unset _JAVA_OPTIONS && javac -version 2>&1)

		@@ -256,6 +260,7 @@ $(info ************************************************************)
		$(error stop)
		endif

		endif # if JAVA_NOT_REQUIRED

		ifndef BUILD_EMULATOR
		# Emulator binaries are now provided under prebuilts/android-emulator/

+2 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ LOCAL_REQUIRED_MODULES := libconscrypt_openjdk_jni
		include $(BUILD_HOST_JAVA_LIBRARY)

		ifeq ($(TARGET_BUILD_APPS),)
		ifeq ($(BRILLO),)
		# The post-build signing tools need signapk.jar and its shared libraries,
		# but we don't need this if we're just doing unbundled apps.
		my_dist_files := $(LOCAL_INSTALLED_MODULE) \
		@@ -34,3 +35,4 @@ my_dist_files := $(LOCAL_INSTALLED_MODULE) \
		$(call dist-for-goals,droidcore,$(my_dist_files))
		my_dist_files :=
		endif
		endif