diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2014-02-07 03:22:04 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2014-02-07 03:22:04 +0000 |
| commit | c18bd1ce3786b94572c243b37a115e4e5db473a6 (patch) | |
| tree | bf82a1b8201a453405733d12b604a0bbccdac27a | |
| parent | 409cec47b03b06ab0a341444fda7349efbc242cf (diff) | |
Re #1519 [SVN trunk]: Related to r4737, for Android, don't override JAVA_HOME when it is already set (via environment variable).
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4738 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjsip-apps/src/swig/java/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pjsip-apps/src/swig/java/Makefile b/pjsip-apps/src/swig/java/Makefile index 921f43a5..fa6b5130 100644 --- a/pjsip-apps/src/swig/java/Makefile +++ b/pjsip-apps/src/swig/java/Makefile @@ -3,8 +3,10 @@ include ../../../../build/common.mak ifneq ($(findstring android,$(TARGET_NAME)),) OS=android - # Set dummy JAVA_HOME as JNI is bundled in Android NDK, only need javac here - JAVA_HOME := $(dir $(shell which javac)) + ifeq ("$(JAVA_HOME)","") + # Set dummy JAVA_HOME as JNI is bundled in Android NDK, only need javac here + JAVA_HOME := $(dir $(shell which javac)) + endif else ifneq ($(findstring darwin,$(TARGET_NAME)),) OS=darwin |