LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 4bf2ce27: SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts

Browse Source 
Merge commit '4bf2ce27a00c564daf0831c16769ee1ca259ddc7' into eclair

* commit '4bf2ce27a00c564daf0831c16769ee1ca259ddc7':
  SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
This commit is contained in:
Raphael
2009-11-03 12:17:52 -08:00
committed by Android Git Automerger
parent f9e0b26442 4bf2ce27a0
commit 03684b9d88
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/ddms/app/etc/ddms
View File

@@ -71,6 +71,10 @@ else
os_opts= os_opts=
fi fi
if [ `uname` = "Linux" ]; then
export GDK_NATIVE_WINDOWS=true
fi
jarpath="$frameworkdir/$jarfile" jarpath="$frameworkdir/$jarfile"
# Figure out the path to the swt.jar for the current architecture. # Figure out the path to the swt.jar for the current architecture.

4
tools/sdkmanager/app/etc/android
View File

@@ -71,6 +71,10 @@ else
os_opts= os_opts=
fi fi
if [ `uname` = "Linux" ]; then
export GDK_NATIVE_WINDOWS=true
fi
if [ "$OSTYPE" = "cygwin" ] ; then if [ "$OSTYPE" = "cygwin" ] ; then
jarpath=`cygpath -w "$frameworkdir/$jarfile"` jarpath=`cygpath -w "$frameworkdir/$jarfile"`
progdir=`cygpath -w "$progdir"` progdir=`cygpath -w "$progdir"`

4
tools/traceview/etc/traceview
View File

@@ -63,6 +63,10 @@ else
javaOpts="-Xmx1600M" javaOpts="-Xmx1600M"
fi fi
if [ `uname` = "Linux" ]; then
export GDK_NATIVE_WINDOWS=true
fi
while expr "x$1" : 'x-J' >/dev/null; do while expr "x$1" : 'x-J' >/dev/null; do
opt=`expr "$1" : '-J\(.*\)'` opt=`expr "$1" : '-J\(.*\)'`
javaOpts="${javaOpts} -${opt}" javaOpts="${javaOpts} -${opt}"