release-request-c9e3b153-009d-4386-b83e-337752602795-for-git_oc-mr1-release-4111654 snap-temp-L22900000075285650

Change-Id: I5d96ed3d878a78c2b7e368843262e905d7688710

6 files changed, 45 insertions, 2 deletions

diff --git a/common/args4j/Android.mk b/common/args4j/Android.mk
new file mode 100644
index 00000000..c81bef7f
--- /dev/null
+++ b/common/args4j/Android.mk
@@ -0,0 +1,22 @@
+# Copyright (C) 2017 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_STATIC_JAVA_LIBRARIES := \
+    args4j-2.0.28:args4j-2.0.28.jar\
+
+include $(BUILD_HOST_PREBUILT)
diff --git a/common/args4j/LICENSE b/common/args4j/LICENSE
new file mode 100644
index 00000000..c49840b2
--- /dev/null
+++ b/common/args4j/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2013 Kohsuke Kawaguchi and other contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/common/args4j/PREBUILT b/common/args4j/PREBUILT
new file mode 100644
index 00000000..a018f903
--- /dev/null
+++ b/common/args4j/PREBUILT
@@ -0,0 +1,2 @@
+Code from https://github.com/kohsuke/args4j
+Binary from http://central.maven.org/maven2/args4j/args4j/2.0.28/args4j-2.0.28.jar
diff --git a/common/args4j/args4j-2.0.28.jar b/common/args4j/args4j-2.0.28.jar
new file mode 100644
index 00000000..09f69b22
--- /dev/null
+++ b/common/args4j/args4j-2.0.28.jar
diff --git a/common/ddmlib/PREBUILT b/common/ddmlib/PREBUILT
index 3cc3d847..174adda1 100644
--- a/common/ddmlib/PREBUILT
+++ b/common/ddmlib/PREBUILT
@@ -1,9 +1,9 @@
 The object in this prebuilt directory can be built from
 	platform/tools/base
 
-From the commit 9b8caac556d591a1d2566264d3643a12ea3ecb16
+From the commit f764d774fbdf4fa7cf258b2e8c328a458a9aca53
 
-Jar is obtained from git_studio-master-dev@3809650
+Jar is obtained from git_studio-master-dev@4058845
 
 Note: Before dropping the ddmlib-prebuilt.jar, please run
 the following command to strip the jar manifest file,
diff --git a/common/ddmlib/ddmlib-prebuilt.jar b/common/ddmlib/ddmlib-prebuilt.jar
index 7e19c0b1..42cde73a 100644
--- a/common/ddmlib/ddmlib-prebuilt.jar
+++ b/common/ddmlib/ddmlib-prebuilt.jar