diff options
author | Raphael Moll <ralf@android.com> | 2013-01-04 11:24:13 -0800 |
---|---|---|
committer | Raphael Moll <ralf@android.com> | 2013-01-08 13:59:33 -0800 |
commit | d09956e1e7375d5a6ddd6d2d8c61c96376333d5f (patch) | |
tree | dfed5d7f754235fb95e2e717cfce053177902afa /manifmerger/etc | |
parent | b6049e3c93e27b943832ec300a6d9b04f4f6d474 (diff) | |
download | sdk-d09956e1e7375d5a6ddd6d2d8c61c96376333d5f.zip sdk-d09956e1e7375d5a6ddd6d2d8c61c96376333d5f.tar.gz sdk-d09956e1e7375d5a6ddd6d2d8c61c96376333d5f.tar.bz2 |
SDK: Remove sources for jobb & manifmerge. They are in tools/base now.
Change-Id: I1092079acad333deda47d4c8a092279879fadea6
Diffstat (limited to 'manifmerger/etc')
-rw-r--r-- | manifmerger/etc/Android.mk | 10 | ||||
-rw-r--r-- | manifmerger/etc/manifest.txt | 2 | ||||
-rwxr-xr-x | manifmerger/etc/manifmerger | 87 |
3 files changed, 0 insertions, 99 deletions
diff --git a/manifmerger/etc/Android.mk b/manifmerger/etc/Android.mk deleted file mode 100644 index 6b180ab..0000000 --- a/manifmerger/etc/Android.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 2011 The Android Open Source Project -# -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_PREBUILT_EXECUTABLES := manifmerger -LOCAL_MODULE_TAGS := optional - -include $(BUILD_HOST_PREBUILT) - diff --git a/manifmerger/etc/manifest.txt b/manifmerger/etc/manifest.txt deleted file mode 100644 index bfc9524..0000000 --- a/manifmerger/etc/manifest.txt +++ /dev/null @@ -1,2 +0,0 @@ -Main-Class: com.android.manifestmerger.Main -Class-Path: sdklib.jar diff --git a/manifmerger/etc/manifmerger b/manifmerger/etc/manifmerger deleted file mode 100755 index 1e2c2a7..0000000 --- a/manifmerger/etc/manifmerger +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/sh -# Copyright 2011, 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. - -# Set up prog to be the path of this script, including following symlinks, -# and set up progdir to be the fully-qualified pathname of its directory. -prog="$0" -while [ -h "${prog}" ]; do - newProg=`/bin/ls -ld "${prog}"` - newProg=`expr "${newProg}" : ".* -> \(.*\)$"` - if expr "x${newProg}" : 'x/' >/dev/null; then - prog="${newProg}" - else - progdir=`dirname "${prog}"` - prog="${progdir}/${newProg}" - fi -done -oldwd=`pwd` -progdir=`dirname "${prog}"` -cd "${progdir}" -progdir=`pwd` -prog="${progdir}"/`basename "${prog}"` -cd "${oldwd}" - -jarfile=manifmerger.jar -frameworkdir="$progdir" -if [ ! -r "$frameworkdir/$jarfile" ] -then - frameworkdir=`dirname "$progdir"`/tools/lib -fi -if [ ! -r "$frameworkdir/$jarfile" ] -then - frameworkdir=`dirname "$progdir"`/framework -fi -if [ ! -r "$frameworkdir/$jarfile" ] -then - echo `basename "$prog"`": can't find $jarfile" - exit 1 -fi - - -# Check args. -if [ debug = "$1" ]; then - # add this in for debugging - java_debug=-agentlib:jdwp=transport=dt_socket,server=y,address=8050,suspend=y - shift 1 -else - java_debug= -fi - -java_cmd="java" - -# 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 [ `uname` = "Linux" ]; then - export GDK_NATIVE_WINDOWS=true -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 -exec "$java_cmd" \ - -Xmx256M $os_opts $java_debug \ - -Dcom.android.manifmergerdir="$progdir" \ - -classpath "$jarpath" \ - com.android.manifestmerger.Main "$@" |