diff options
author | Xavier Ducrohet <xav@android.com> | 2010-06-16 15:02:35 -0700 |
---|---|---|
committer | Xavier Ducrohet <xav@android.com> | 2010-06-16 18:23:27 -0700 |
commit | e48a35070a0b27ec8ea99e2cd3bf999a11b175b5 (patch) | |
tree | c06c3be8fd634fb364503b7be063822b35a32e00 /apkbuilder/etc | |
parent | 2a035855ee6c91bdfa25516ea39195ee263471ab (diff) | |
download | sdk-e48a35070a0b27ec8ea99e2cd3bf999a11b175b5.zip sdk-e48a35070a0b27ec8ea99e2cd3bf999a11b175b5.tar.gz sdk-e48a35070a0b27ec8ea99e2cd3bf999a11b175b5.tar.bz2 |
Move Apkbuilder into sdklib.
Change-Id: I88f7e6101b8c03157a320a6c9d9b7424ffbdc7f5
Diffstat (limited to 'apkbuilder/etc')
-rw-r--r-- | apkbuilder/etc/Android.mk | 22 | ||||
-rwxr-xr-x | apkbuilder/etc/apkbuilder | 16 | ||||
-rwxr-xr-x | apkbuilder/etc/apkbuilder.bat | 7 | ||||
-rw-r--r-- | apkbuilder/etc/manifest.txt | 1 |
4 files changed, 4 insertions, 42 deletions
diff --git a/apkbuilder/etc/Android.mk b/apkbuilder/etc/Android.mk deleted file mode 100644 index d74db17..0000000 --- a/apkbuilder/etc/Android.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (C) 2008 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_PREBUILT_EXECUTABLES := apkbuilder -include $(BUILD_HOST_PREBUILT) - diff --git a/apkbuilder/etc/apkbuilder b/apkbuilder/etc/apkbuilder index 3e7e822..2116cdc 100755 --- a/apkbuilder/etc/apkbuilder +++ b/apkbuilder/etc/apkbuilder @@ -33,18 +33,15 @@ progdir=`pwd` prog="${progdir}"/`basename "${prog}"` cd "${oldwd}" -jarfile=apkbuilder.jar +jarfile=sdklib.jar frameworkdir="$progdir" -libdir="$progdir" if [ ! -r "$frameworkdir/$jarfile" ] then frameworkdir=`dirname "$progdir"`/tools/lib - libdir=`dirname "$progdir"`/tools/lib fi if [ ! -r "$frameworkdir/$jarfile" ] then frameworkdir=`dirname "$progdir"`/framework - libdir=`dirname "$progdir"`/lib fi if [ ! -r "$frameworkdir/$jarfile" ] then @@ -62,20 +59,11 @@ else java_debug= fi -# Mac OS X needs an additional arg, or you get an "illegal thread" complaint. -if [ `uname` = "Darwin" ]; then - os_opts="-XstartOnFirstThread" -else - os_opts= -fi - if [ "$OSTYPE" = "cygwin" ] ; then jarpath=`cygpath -w "$frameworkdir/$jarfile"` - progdir=`cygpath -w "$progdir"` else jarpath="$frameworkdir/$jarfile" fi -# need to use "java.ext.dirs" because "-jar" causes classpath to be ignored # might need more memory, e.g. -Xmx128M -exec java -Xmx128M $os_opts $java_debug -Djava.ext.dirs="$frameworkdir" -Djava.library.path="$libdir" -jar "$jarpath" "$@" +exec java -Xmx128M $java_debug -classpath "$jarpath" com.android.sdklib.build.ApkBuilderMain "$@" diff --git a/apkbuilder/etc/apkbuilder.bat b/apkbuilder/etc/apkbuilder.bat index eaaf9b8..c82f01d 100755 --- a/apkbuilder/etc/apkbuilder.bat +++ b/apkbuilder/etc/apkbuilder.bat @@ -29,20 +29,17 @@ set java_exe= call lib\find_java.bat if not defined java_exe goto :EOF -set jarfile=apkbuilder.jar +set jarfile=sdklib.jar set frameworkdir= -set libdir= if exist %frameworkdir%%jarfile% goto JarFileOk set frameworkdir=lib\ - set libdir=lib\ if exist %frameworkdir%%jarfile% goto JarFileOk set frameworkdir=..\framework\ - set libdir=..\lib\ :JarFileOk set jarpath=%frameworkdir%%jarfile% -call %java_exe% -Djava.ext.dirs=%frameworkdir% -Djava.library.path=%libdir% -jar %jarpath% %* +call %java_exe% -classpath %jarpath% com.android.sdklib.build.ApkBuilderMain %* diff --git a/apkbuilder/etc/manifest.txt b/apkbuilder/etc/manifest.txt deleted file mode 100644 index 6aafb16..0000000 --- a/apkbuilder/etc/manifest.txt +++ /dev/null @@ -1 +0,0 @@ -Main-Class: com.android.apkbuilder.ApkBuilder |