openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "brillo: Remove dependency on java for Brillo" 

am: 6c8e3e4108

* commit '6c8e3e41085d75184ae321c12e26cf26002552d3':
  brillo: Remove dependency on java for Brillo
This commit is contained in:
Lee Campbell 2016-01-29 23:46:16 +00:00 committed by android-build-merger
parent 7a86884a9a 6c8e3e4108
commit fd5d6f440a
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/main.mk
View File

@ -57,6 +57,9 @@ TOPDIR :=
BUILD_SYSTEM := $(TOPDIR)build/core 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. # This is the default target. It must be the first declared target.
.PHONY: droid .PHONY: droid
DEFAULT_GOAL := droid DEFAULT_GOAL := droid
@ -177,6 +180,7 @@ $(warning ************************************************************)
$(error Directory names containing spaces not supported) $(error Directory names containing spaces not supported)
endif endif
ifeq ($(JAVA_NOT_REQUIRED), false)
java_version_str := $(shell unset _JAVA_OPTIONS && java -version 2>&1) java_version_str := $(shell unset _JAVA_OPTIONS && java -version 2>&1)
javac_version_str := $(shell unset _JAVA_OPTIONS && javac -version 2>&1) javac_version_str := $(shell unset _JAVA_OPTIONS && javac -version 2>&1)
@ -256,6 +260,7 @@ $(info ************************************************************)
$(error stop) $(error stop)
endif endif
endif # if JAVA_NOT_REQUIRED
ifndef BUILD_EMULATOR ifndef BUILD_EMULATOR
# Emulator binaries are now provided under prebuilts/android-emulator/ # Emulator binaries are now provided under prebuilts/android-emulator/

2
tools/signapk/Android.mk
View File

@ -26,6 +26,7 @@ LOCAL_REQUIRED_MODULES := libconscrypt_openjdk_jni
include $(BUILD_HOST_JAVA_LIBRARY) include $(BUILD_HOST_JAVA_LIBRARY)
ifeq ($(TARGET_BUILD_APPS),) ifeq ($(TARGET_BUILD_APPS),)
ifeq ($(BRILLO),)
# The post-build signing tools need signapk.jar and its shared libraries, # 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. # but we don't need this if we're just doing unbundled apps.
my_dist_files := $(LOCAL_INSTALLED_MODULE) \ my_dist_files := $(LOCAL_INSTALLED_MODULE) \
@ -34,3 +35,4 @@ my_dist_files := $(LOCAL_INSTALLED_MODULE) \
$(call dist-for-goals,droidcore,$(my_dist_files)) $(call dist-for-goals,droidcore,$(my_dist_files))
my_dist_files := my_dist_files :=
endif endif
endif