Mercurial Mercurial > gentoo-repos / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dev-util/android-sdk-update-manager/files/android-sdk-update-manager-6-swt.patch
author Da Risk <da_risk@geekorum.com>
Mon, 03 Apr 2017 10:22:23 -0700
changeset 201 37de2618fc68
parent 0 58d5cc68f922
permissions -rw-r--r--
Remove old android-studio that are already in main gentoo tree
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     1
 
--- android-sdk-linux_86/tools/android.old      2010-08-16 19:56:17.522813374 -0400
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     2
 
+++ android-sdk-linux_86/tools/android  2010-08-16 19:56:57.876813929 -0400
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     3
 
@@ -93,13 +93,7 @@
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     4
 
 if [ -n "$ANDROID_SWT" ]; then
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     5
 
     swtpath="$ANDROID_SWT"
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     6
 
 else
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     7
 
-    vmarch=`"${java_cmd}" -jar "${frameworkdir}/archquery.jar"`
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     8
 
-    if [ -n "$ANDROID_BUILD_TOP" ]; then
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     9
 
-        osname=`uname -s | tr A-Z a-z`
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    10
 
-        swtpath="${ANDROID_BUILD_TOP}/prebuilt/${osname}-${vmarch}/swt"
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    11
 
-    else
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    12
 
-        swtpath="${frameworkdir}/${vmarch}"
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    13
 
-    fi
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    14
 
+    swtpath=`dirname \`java-config -p swt-3.5\``
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    15
 
 fi
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    16
 












58d5cc68f922
Initial import



Da Risk <darisk972@gmail.com>


parents: 

diff
changeset




    17


 # Combine the swtpath and the framework dir path.












58d5cc68f922
Initial import



Da Risk <darisk972@gmail.com>


parents: 

diff
changeset




    18


--- android-sdk-linux_86/tools/ddms.old         2010-08-21 18:25:12.000000000 +0200












58d5cc68f922
Initial import



Da Risk <darisk972@gmail.com>


parents: 

diff
changeset




    19


+++ android-sdk-linux_86/tools/ddms             2010-08-26 14:44:36.000000000 +0200












58d5cc68f922
Initial import



Da Risk <darisk972@gmail.com>


parents: 

diff
changeset




    20


@@ -85,13 +85,7 @@












58d5cc68f922
Initial import



Da Risk <darisk972@gmail.com>


parents: 

diff
changeset




    21


 if [ -n "$ANDROID_SWT" ]; then












58d5cc68f922
Initial import



Da Risk <darisk972@gmail.com>


parents: 

diff
changeset




    22


     swtpath="$ANDROID_SWT"












58d5cc68f922
Initial import



Da Risk <darisk972@gmail.com>


parents: 

diff
changeset




    23


 else












58d5cc68f922
Initial import



Da Risk <darisk972@gmail.com>


parents: 

diff
changeset




    24


-    vmarch=`${javaCmd} -jar "${frameworkdir}"/archquery.jar`












58d5cc68f922
Initial import



Da Risk <darisk972@gmail.com>


parents: 

diff
changeset




    25


-    if [ -n "$ANDROID_BUILD_TOP" ]; then












58d5cc68f922
Initial import



Da Risk <darisk972@gmail.com>


parents: 

diff
changeset




    26


-        osname=`uname -s | tr A-Z a-z`












58d5cc68f922
Initial import



Da Risk <darisk972@gmail.com>


parents: 

diff
changeset




    27


-        swtpath="${ANDROID_BUILD_TOP}/prebuilt/${osname}-${vmarch}/swt"












58d5cc68f922
Initial import



Da Risk <darisk972@gmail.com>


parents: 

diff
changeset




    28


-    else












58d5cc68f922
Initial import



Da Risk <darisk972@gmail.com>


parents: 

diff
changeset




    29


-        swtpath="${frameworkdir}/${vmarch}"












58d5cc68f922
Initial import



Da Risk <darisk972@gmail.com>


parents: 

diff
changeset




    30


-    fi












58d5cc68f922
Initial import



Da Risk <darisk972@gmail.com>


parents: 

diff
changeset




    31


+    swtpath=`dirname \`java-config -p swt-3.5\``












58d5cc68f922
Initial import



Da Risk <darisk972@gmail.com>


parents: 

diff
changeset




    32


 fi












58d5cc68f922
Initial import



Da Risk <darisk972@gmail.com>


parents: 

diff
changeset




    33


 












58d5cc68f922
Initial import



Da Risk <darisk972@gmail.com>


parents: 

diff
changeset




    34


 # Combine the swtpath and the framework dir path.














gentoo repos