diff options
| author | Ben Henry <benhenry@google.com> | 2016-02-02 23:37:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-02-02 23:37:05 +0000 |
| commit | 6c07f890548716f6963271421bb6afe8a7befcf8 (patch) | |
| tree | 774115a3d2ffe330b0ee815a63b6d8e0c963b251 | |
| parent | a63d379aab75fe3991320319f63faddd3b84b287 (diff) | |
| parent | 1f6aadc5b83c10622b181983bdcc5b5178142a3e (diff) | |
| download | build-6c07f890548716f6963271421bb6afe8a7befcf8.tar.gz | |
Merge "brillo: Remove dependency on java for Brillo" into brillo-m7-mr-dev
| -rw-r--r-- | core/main.mk | 5 | ||||
| -rw-r--r-- | tools/signapk/Android.mk | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/core/main.mk b/core/main.mk index 7901bd82f9..511c1409f5 100644 --- a/core/main.mk +++ b/core/main.mk @@ -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 @@ -172,6 +175,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) @@ -251,6 +255,7 @@ $(info ************************************************************) $(error stop) endif +endif # if JAVA_NOT_REQUIRED ifndef BUILD_EMULATOR # Emulator binaries are now provided under prebuilts/android-emulator/ diff --git a/tools/signapk/Android.mk b/tools/signapk/Android.mk index 620ccb1f41..e319913f92 100644 --- a/tools/signapk/Android.mk +++ b/tools/signapk/Android.mk @@ -25,7 +25,9 @@ LOCAL_STATIC_JAVA_LIBRARIES := bouncycastle-host bouncycastle-bcpkix-host include $(BUILD_HOST_JAVA_LIBRARY) ifeq ($(TARGET_BUILD_APPS),) +ifeq ($(BRILLO),) # The post-build signing tools need signapk.jar, but we don't # need this if we're just doing unbundled apps. $(call dist-for-goals,droidcore,$(LOCAL_INSTALLED_MODULE)) endif +endif |