Import L Build Tools from git_lmp-mr1-release build 1735510

http://android-build/builds/git_lmp-mr1-release-mac-sdk_phone_mips-sdk/1735510/sdk-repo-darwin-build-tools-1735510.zip
source.properties has been modified to make this appear as API 22

Change-Id: I19aa9207a7a6cce2f41d34fea7d654a8701362c1

18 files changed, 4 insertions, 6 deletions

diff --git a/aapt b/aapt
index e8e5eb7..55a2fd5 100755
--- a/aapt
+++ b/aapt
diff --git a/aidl b/aidl
index 7532292..ec43258 100755
--- a/aidl
+++ b/aidl
diff --git a/dexdump b/dexdump
index 95aa8d3..86ee693 100755
--- a/dexdump
+++ b/dexdump
diff --git a/jack.jar b/jack.jar
index add4278..804a01b 100644
--- a/jack.jar
+++ b/jack.jar
diff --git a/jill.jar b/jill.jar
index 80ff255..323bba5 100644
--- a/jill.jar
+++ b/jill.jar
diff --git a/lib/++.dylib b/lib/++.dylib
index 837c0dc..63f553b 100644
--- a/lib/++.dylib
+++ b/lib/++.dylib
diff --git a/lib/cc.dylib b/lib/cc.dylib
index 098eea2..adf335e 100644
--- a/lib/cc.dylib
+++ b/lib/cc.dylib
diff --git a/lib/cinfo.dylib b/lib/cinfo.dylib
index ae66222..a976341 100644
--- a/lib/cinfo.dylib
+++ b/lib/cinfo.dylib
diff --git a/lib/dx.jar b/lib/dx.jar
index 4bcab63..12b23e3 100644
--- a/lib/dx.jar
+++ b/lib/dx.jar
diff --git a/libbcc.dylib b/libbcc.dylib
index 098eea2..adf335e 100755
--- a/libbcc.dylib
+++ b/libbcc.dylib
diff --git a/libbcinfo.dylib b/libbcinfo.dylib
index ae66222..a976341 100755
--- a/libbcinfo.dylib
+++ b/libbcinfo.dylib
diff --git a/libc++.dylib b/libc++.dylib
index 837c0dc..63f553b 100644
--- a/libc++.dylib
+++ b/libc++.dylib
diff --git a/llvm-rs-cc b/llvm-rs-cc
index 93709c1..c191b1a 100755
--- a/llvm-rs-cc
+++ b/llvm-rs-cc
diff --git a/mainDexClasses b/mainDexClasses
index 034d47e..28c0f0c 100644
--- a/mainDexClasses
+++ b/mainDexClasses
@@ -155,4 +155,4 @@ ${proguard} -injars ${@} -dontwarn -forceprocessing  -outjars ${tmpOut} \
   -libraryjars "${shrinkedAndroidJar}" -dontoptimize -dontobfuscate -dontpreverify \
   -include "${baserules}" 1>/dev/null || exit 10
 
-java -cp "$jarpath" com.android.multidex.ClassReferenceListBuilder "${tmpOut}" ${@} ||  exit 11
+java -cp "$jarpath" com.android.multidex.MainDexListBuilder "${tmpOut}" ${@} ||  exit 11
diff --git a/renderscript/include/rs_allocation.rsh b/renderscript/include/rs_allocation.rsh
index cdf64e8..03bd1ca 100644
--- a/renderscript/include/rs_allocation.rsh
+++ b/renderscript/include/rs_allocation.rsh
@@ -374,8 +374,7 @@ extern const uchar __attribute__((overloadable))
 
 #endif // (defined(RS_VERSION) && (RS_VERSION >= 18))
 
-// FIXME: this needs to be set to 22
-#if (defined(RS_VERSION) && (RS_VERSION >= 21))
+#if (defined(RS_VERSION) && (RS_VERSION >= 22))
 
 #define VOP(T)                                                                   \
     extern T __attribute__((overloadable))                                       \
@@ -424,8 +423,7 @@ VOP(double4)
 
 #undef VOP
 
-// FIXME
-#endif //(defined(RS_VERSION) && (RS_VERSION >= 21))
+#endif //(defined(RS_VERSION) && (RS_VERSION >= 22))
 
 
 #endif
diff --git a/source.properties b/source.properties
index d62605c..a4a3cf7 100644
--- a/source.properties
+++ b/source.properties
@@ -1,5 +1,5 @@
 Pkg.UserSrc=false
-//Pkg.Revision=22.1.2
+//Pkg.Revision=22.1.3
 
 Archive.Os=MACOSX
 Pkg.Revision=22.0.0
diff --git a/split-select b/split-select
index c1ce5d8..0f70265 100644
--- a/split-select
+++ b/split-select
diff --git a/zipalign b/zipalign
index 7466ba8..3b7a7d6 100755
--- a/zipalign
+++ b/zipalign