diff options
| author | Raphael <raphael@google.com> | 2009-11-03 12:17:52 -0800 | 
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-03 12:17:52 -0800 | 
| commit | a5f91328243f85cbe4a29594de5a6c6b96c31b47 (patch) | |
| tree | 990597c877b547d8eb0cbeea03340ff3ba546ed1 | |
| parent | a1515e32821cecb5afce11a0b087588bcd6fc164 (diff) | |
| parent | 39a669ed17cd198f6a8ec9c484741672ec94426c (diff) | |
| download | sdk-a5f91328243f85cbe4a29594de5a6c6b96c31b47.zip sdk-a5f91328243f85cbe4a29594de5a6c6b96c31b47.tar.gz sdk-a5f91328243f85cbe4a29594de5a6c6b96c31b47.tar.bz2 | |
am 4bf2ce27: SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Merge commit '4bf2ce27a00c564daf0831c16769ee1ca259ddc7' into eclair
* commit '4bf2ce27a00c564daf0831c16769ee1ca259ddc7':
  SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
| -rwxr-xr-x | ddms/app/etc/ddms | 4 | ||||
| -rwxr-xr-x | sdkmanager/app/etc/android | 4 | ||||
| -rwxr-xr-x | traceview/etc/traceview | 4 | 
3 files changed, 12 insertions, 0 deletions
| diff --git a/ddms/app/etc/ddms b/ddms/app/etc/ddms index 873f19e..1367aeb 100755 --- a/ddms/app/etc/ddms +++ b/ddms/app/etc/ddms @@ -71,6 +71,10 @@ else      os_opts=  fi +if [ `uname` = "Linux" ]; then +    export GDK_NATIVE_WINDOWS=true +fi +  jarpath="$frameworkdir/$jarfile"  # Figure out the path to the swt.jar for the current architecture. diff --git a/sdkmanager/app/etc/android b/sdkmanager/app/etc/android index 75c9485..8feb5f2 100755 --- a/sdkmanager/app/etc/android +++ b/sdkmanager/app/etc/android @@ -71,6 +71,10 @@ else      os_opts=  fi +if [ `uname` = "Linux" ]; then +    export GDK_NATIVE_WINDOWS=true +fi +  if [ "$OSTYPE" = "cygwin" ] ; then      jarpath=`cygpath -w  "$frameworkdir/$jarfile"`      progdir=`cygpath -w  "$progdir"` diff --git a/traceview/etc/traceview b/traceview/etc/traceview index 3d1771f..065cd0f 100755 --- a/traceview/etc/traceview +++ b/traceview/etc/traceview @@ -63,6 +63,10 @@ else    javaOpts="-Xmx1600M"  fi +if [ `uname` = "Linux" ]; then +    export GDK_NATIVE_WINDOWS=true +fi +  while expr "x$1" : 'x-J' >/dev/null; do      opt=`expr "$1" : '-J\(.*\)'`      javaOpts="${javaOpts} -${opt}" | 
