Changeset 4738


Ignore:
Timestamp:
Feb 7, 2014 3:22:04 AM (6 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:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip-apps/src/swig/java/Makefile

    r4737 r4738  
    44ifneq ($(findstring android,$(TARGET_NAME)),) 
    55 OS=android 
    6  # Set dummy JAVA_HOME as JNI is bundled in Android NDK, only need javac here 
    7  JAVA_HOME := $(dir $(shell which javac)) 
     6 ifeq ("$(JAVA_HOME)","") 
     7   # Set dummy JAVA_HOME as JNI is bundled in Android NDK, only need javac here 
     8   JAVA_HOME := $(dir $(shell which javac)) 
     9 endif 
    810else 
    911 ifneq ($(findstring darwin,$(TARGET_NAME)),) 
Note: See TracChangeset for help on using the changeset viewer.