Import build-tools r21.1.2 - DO NOT MERGEstudio-master-dev_before_27917934studio-master-dev_before_26911779studio-3.1.2studio-3.0studio-2.3studio-2.0-rc1studio-2.0studio-1.5gradle_3.1.2gradle_3.0.0gradle_2.3.0gradle_2.0.0studio-master-dev

http://dl.google.com/android/repository/build-tools_r21.1.2-linux.zip

Change-Id: I2f58f18979f4387fbd6e3472ea86a18633067823

27 files changed, 186 insertions, 3 deletions

diff --git a/aapt b/aapt
index 95e5c30..966f5e8 100755
--- a/aapt
+++ b/aapt
diff --git a/jack.jar b/jack.jar
index add4278..2c64e74 100644
--- a/jack.jar
+++ b/jack.jar
diff --git a/jill.jar b/jill.jar
index 80ff255..98e6a59 100644
--- a/jill.jar
+++ b/jill.jar
diff --git a/lib/++.so b/lib/++.so
deleted file mode 100644
index 723d71c..0000000
--- a/lib/++.so
+++ /dev/null
diff --git a/lib/LVM.so b/lib/LVM.so
deleted file mode 100644
index c6e927f..0000000
--- a/lib/LVM.so
+++ /dev/null
diff --git a/lib/cc.so b/lib/cc.so
deleted file mode 100644
index 359a9a9..0000000
--- a/lib/cc.so
+++ /dev/null
diff --git a/lib/cinfo.so b/lib/cinfo.so
deleted file mode 100644
index f427171..0000000
--- a/lib/cinfo.so
+++ /dev/null
diff --git a/lib/dx.jar b/lib/dx.jar
index 6221110..73748bc 100644
--- a/lib/dx.jar
+++ b/lib/dx.jar
diff --git a/lib/lang.so b/lib/lang.so
deleted file mode 100644
index ce91323..0000000
--- a/lib/lang.so
+++ /dev/null
diff --git a/lib/shrinkedAndroid.jar b/lib/shrinkedAndroid.jar
new file mode 100644
index 0000000..b485061
--- /dev/null
+++ b/lib/shrinkedAndroid.jar
diff --git a/libc++.so b/libc++.so
index 723d71c..723d71c 100644..100755
--- a/libc++.so
+++ b/libc++.so
diff --git a/llvm-rs-cc b/llvm-rs-cc
index d03ac24..1d47804 100755
--- a/llvm-rs-cc
+++ b/llvm-rs-cc
diff --git a/mainDexClasses b/mainDexClasses
new file mode 100755
index 0000000..28c0f0c
--- /dev/null
+++ b/mainDexClasses
@@ -0,0 +1,158 @@
+#!/bin/bash
+#
+# Copyright (C) 2013 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.
+
+function makeTempJar ()
+{
+  local tempDir=/tmp
+  if [ ! -e "${tempDir}" ]; then
+    tempDir=.
+  fi
+  local tempfile="${tempDir}/mainDexClasses-$$.tmp.jar"
+  if [ -e "${tempfile}" ]; then
+    echo "Failed to create temporary file" >2
+    exit 6
+  fi
+  echo "${tempfile}"
+}
+
+function cleanTmp ()
+{
+  if [ -e "${tmpOut}" ] ; then
+    rm "${tmpOut}"
+  fi
+}
+
+
+# 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}"
+
+baserules="${progdir}"/mainDexClasses.rules
+if [ ! -r ${baserules} ]; then
+    echo `basename "$prog"`": can't find mainDexClasses.rules" 1>&2
+    exit 1
+fi
+
+jarfile=dx.jar
+libdir="$progdir"
+
+if [ ! -r "$libdir/$jarfile" ]; then
+    # set dx.jar location for the SDK case
+    libdir="$libdir/lib"
+fi
+
+
+if [ ! -r "$libdir/$jarfile" ]; then
+    # set dx.jar location for the Android tree case
+    libdir=`dirname "$progdir"`/framework
+fi
+
+if [ ! -r "$libdir/$jarfile" ]; then
+    echo `basename "$prog"`": can't find $jarfile" 1>&2
+    exit 1
+fi
+
+proguardExec="proguard.sh"
+proguard=${PROGUARD_HOME}/bin/${proguardExec}
+
+if [ ! -r "${proguard}" ]; then
+  # set proguard location for the SDK case
+  proguardBaseDir=`dirname "$progdir"`
+  # "${progdir}"/../..
+  proguardBaseDir=`dirname "$proguardBaseDir"`
+  proguard="${proguardBaseDir}"/tools/proguard/bin/${proguardExec}
+fi
+
+if [ ! -r "${proguard}" ]; then
+  # set proguard location for the Android tree case
+  proguardBaseDir=`dirname "$proguardBaseDir"`
+  # "${progdir}"/../../../..
+  proguardBaseDir=`dirname "$proguardBaseDir"`
+  proguard="${proguardBaseDir}"/external/proguard/bin/${proguardExec}
+fi
+
+if [ ! -r "${proguard}" ]; then
+    proguard="`which proguard`"
+fi
+
+if [ -z "${proguard}" -o ! -r "${proguard}" ]; then
+    proguard="`which ${proguardExec}`"
+fi
+
+if [ -z "${proguard}" -o ! -r "${proguard}" ]; then
+    echo `basename "$prog"`": can't find ${proguardExec}" 1>&2
+    exit 1
+fi
+
+shrinkedAndroidJar="${SHRINKED_ANDROID_JAR}"
+if [ -z "${shrinkedAndroidJar}" ]; then
+  shrinkedAndroidJar=shrinkedAndroid.jar
+fi
+
+if [ ! -r "${shrinkedAndroidJar}" ]; then
+  shrinkedAndroidJar=${libdir}/${shrinkedAndroidJar}
+fi
+
+if [ ! -r "${shrinkedAndroidJar}" ]; then
+    echo `basename "$prog"`": can't find shrinkedAndroid.jar" 1>&2
+    exit 1
+fi
+
+if [ "$OSTYPE" = "cygwin" ]; then
+    # For Cygwin, convert the jarfile path into native Windows style.
+    jarpath=`cygpath -w "$libdir/$jarfile"`
+  proguard=`cygpath -w "${proguard}"`
+  shrinkedAndroidJar=`cygpath -w "${shrinkedAndroidJar}"`
+else
+    jarpath="$libdir/$jarfile"
+fi
+
+if expr "x$1" : 'x--output' >/dev/null; then
+    exec 1>$2
+    shift 2
+fi
+
+if [ $# -ne 1 ]; then
+  echo "Usage : $0 [--output <output file>] <application path>" 1>&2
+  exit 2
+fi
+
+tmpOut=`makeTempJar`
+
+trap cleanTmp 0
+
+${proguard} -injars ${@} -dontwarn -forceprocessing  -outjars ${tmpOut} \
+  -libraryjars "${shrinkedAndroidJar}" -dontoptimize -dontobfuscate -dontpreverify \
+  -include "${baserules}" 1>/dev/null || exit 10
+
+java -cp "$jarpath" com.android.multidex.MainDexListBuilder "${tmpOut}" ${@} ||  exit 11
diff --git a/mainDexClasses.rules b/mainDexClasses.rules
new file mode 100644
index 0000000..af4085a
--- /dev/null
+++ b/mainDexClasses.rules
@@ -0,0 +1,27 @@
+  -keep public class * extends android.app.Instrumentation {

+    <init>();

+  }

+  -keep public class * extends android.app.Application {

+    <init>();

+    void attachBaseContext(android.content.Context);

+  }

+  -keep public class * extends android.app.Activity {

+    <init>();

+  }

+  -keep public class * extends android.app.Service {

+    <init>();

+  }

+  -keep public class * extends android.content.ContentProvider {

+   <init>();

+  }

+  -keep public class * extends android.content.BroadcastReceiver {

+   <init>();

+  }

+  -keep public class * extends android.app.backup.BackupAgent {

+   <init>();

+  }

+# We need to keep all annotation classes because proguard does not trace annotation attribute

+# it just filter the annotation attributes according to annotation classes it already kept.

+  -keep public class * extends java.lang.annotation.Annotation {

+   *;

+  }

diff --git a/renderscript/lib/intermediates/armeabi-v7a/libc.so b/renderscript/lib/intermediates/armeabi-v7a/libc.so
index 03c346e..03c346e 100644..100755
--- a/renderscript/lib/intermediates/armeabi-v7a/libc.so
+++ b/renderscript/lib/intermediates/armeabi-v7a/libc.so
diff --git a/renderscript/lib/intermediates/armeabi-v7a/libm.so b/renderscript/lib/intermediates/armeabi-v7a/libm.so
index 96b9091..96b9091 100644..100755
--- a/renderscript/lib/intermediates/armeabi-v7a/libm.so
+++ b/renderscript/lib/intermediates/armeabi-v7a/libm.so
diff --git a/renderscript/lib/intermediates/mips/libc.so b/renderscript/lib/intermediates/mips/libc.so
index c611d69..c611d69 100644..100755
--- a/renderscript/lib/intermediates/mips/libc.so
+++ b/renderscript/lib/intermediates/mips/libc.so
diff --git a/renderscript/lib/intermediates/mips/libm.so b/renderscript/lib/intermediates/mips/libm.so
index e07fe68..e07fe68 100644..100755
--- a/renderscript/lib/intermediates/mips/libm.so
+++ b/renderscript/lib/intermediates/mips/libm.so
diff --git a/renderscript/lib/intermediates/x86/libc.so b/renderscript/lib/intermediates/x86/libc.so
index 3f08c08..3f08c08 100644..100755
--- a/renderscript/lib/intermediates/x86/libc.so
+++ b/renderscript/lib/intermediates/x86/libc.so
diff --git a/renderscript/lib/intermediates/x86/libm.so b/renderscript/lib/intermediates/x86/libm.so
index 0ef13e2..0ef13e2 100644..100755
--- a/renderscript/lib/intermediates/x86/libm.so
+++ b/renderscript/lib/intermediates/x86/libm.so
diff --git a/renderscript/lib/packaged/armeabi-v7a/libRSSupport.so b/renderscript/lib/packaged/armeabi-v7a/libRSSupport.so
index 619f5d0..619f5d0 100644..100755
--- a/renderscript/lib/packaged/armeabi-v7a/libRSSupport.so
+++ b/renderscript/lib/packaged/armeabi-v7a/libRSSupport.so
diff --git a/renderscript/lib/packaged/armeabi-v7a/librsjni.so b/renderscript/lib/packaged/armeabi-v7a/librsjni.so
index 4b578ee..4b578ee 100644..100755
--- a/renderscript/lib/packaged/armeabi-v7a/librsjni.so
+++ b/renderscript/lib/packaged/armeabi-v7a/librsjni.so
diff --git a/renderscript/lib/packaged/mips/libRSSupport.so b/renderscript/lib/packaged/mips/libRSSupport.so
index e59849f..e59849f 100644..100755
--- a/renderscript/lib/packaged/mips/libRSSupport.so
+++ b/renderscript/lib/packaged/mips/libRSSupport.so
diff --git a/renderscript/lib/packaged/mips/librsjni.so b/renderscript/lib/packaged/mips/librsjni.so
index 99c8af7..99c8af7 100644..100755
--- a/renderscript/lib/packaged/mips/librsjni.so
+++ b/renderscript/lib/packaged/mips/librsjni.so
diff --git a/renderscript/lib/packaged/x86/libRSSupport.so b/renderscript/lib/packaged/x86/libRSSupport.so
index db3bfe4..db3bfe4 100644..100755
--- a/renderscript/lib/packaged/x86/libRSSupport.so
+++ b/renderscript/lib/packaged/x86/libRSSupport.so
diff --git a/renderscript/lib/packaged/x86/librsjni.so b/renderscript/lib/packaged/x86/librsjni.so
index 31e8f35..31e8f35 100644..100755
--- a/renderscript/lib/packaged/x86/librsjni.so
+++ b/renderscript/lib/packaged/x86/librsjni.so
diff --git a/source.properties b/source.properties
index 15af7c1..fe76a8a 100644
--- a/source.properties
+++ b/source.properties
@@ -1,5 +1,3 @@
 Pkg.UserSrc=false
-Pkg.Revision=21.1.0
+Pkg.Revision=21.1.2
 
-Archive.Os=LINUX
-Archive.Arch=ANY