Changeset 4738 for pjproject

Timestamp:

Feb 7, 2014 3:22:04 AM (10 years ago)

Author:

nanang

Message:

Re #1519 [SVN trunk]: Related to r4737, for Android, don't override JAVA_HOME when it is already set (via environment variable).

File:

• pjproject/trunk/pjsip-apps/src/swig/java/Makefile (modified) (1 diff)

pjproject/trunk/pjsip-apps/src/swig/java/Makefile

@@ -4 +4 @@
 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)),)