am f2eae8a3: am 6875de5f: Merge "Update relocation packer"
* commit 'f2eae8a3d50db6b9b1209c5b6382bc6edf4cfdf4':
Update relocation packer
diff --git a/common/android-support-test/PREBUILT b/common/android-support-test/PREBUILT
index c7f6b4e..df341c1 100644
--- a/common/android-support-test/PREBUILT
+++ b/common/android-support-test/PREBUILT
@@ -1,4 +1,4 @@
The object in this prebuilt directory can be rebuilt from
platform/frameworks/testing/support
-From the revision 89ba275204f98e5f7283bbda53d20c99225fe995
+From the revision 21bf376aca8d2aa1ea8ed6fa8246f73a7837aa56
diff --git a/common/android-support-test/android-support-test.jar b/common/android-support-test/android-support-test.jar
index bf4f7cd..8ac3990 100644
--- a/common/android-support-test/android-support-test.jar
+++ b/common/android-support-test/android-support-test.jar
Binary files differ
diff --git a/common/android-support-test/espresso-core.jar b/common/android-support-test/espresso-core.jar
index 482c456..1a71c31 100644
--- a/common/android-support-test/espresso-core.jar
+++ b/common/android-support-test/espresso-core.jar
Binary files differ
diff --git a/common/ddmlib/PREBUILT b/common/ddmlib/PREBUILT
index 91a2cde..2499aef 100644
--- a/common/ddmlib/PREBUILT
+++ b/common/ddmlib/PREBUILT
@@ -1,7 +1,7 @@
The object in this prebuilt directory is a copy of the jar from
platform/tools/base
-From the commit 5f23e7bbf550ed69576dff2178c21c7109259a2e
+From the commit 4614694b99a80f2c5498c2304762406389b2e852
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 e12bc93..1e4df9f 100644
--- a/common/ddmlib/ddmlib-prebuilt.jar
+++ b/common/ddmlib/ddmlib-prebuilt.jar
Binary files differ
diff --git a/common/guava/Android.mk b/common/guava/Android.mk
new file mode 100644
index 0000000..b30766c
--- /dev/null
+++ b/common/guava/Android.mk
@@ -0,0 +1,27 @@
+# Copyright (C) 2014 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_MODULE := guava-15.0-prebuilt
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := guava-15.0.jar
+LOCAL_IS_HOST_MODULE := true
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_BUILT_MODULE_STEM := javalib.jar
+LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
+
+include $(BUILD_PREBUILT)
diff --git a/common/guava/NOTICE b/common/guava/NOTICE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/common/guava/NOTICE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
diff --git a/common/guava/PREBUILT b/common/guava/PREBUILT
new file mode 100644
index 0000000..85a6f5a
--- /dev/null
+++ b/common/guava/PREBUILT
@@ -0,0 +1,5 @@
+copy of prebuilts/tools/common/m2/repository/com/google/guava/guava/15.0/guava-15.0.jar
+f54daebf34dd5ba1087f576cc5f2df16c2328d35
+
+TODO: delete this copy and just rely on above. This copy is here
+so projects that do not have prebuilts/tools can build against this jar.
diff --git a/common/guava/guava-15.0.jar b/common/guava/guava-15.0.jar
new file mode 100644
index 0000000..eb9ef8a
--- /dev/null
+++ b/common/guava/guava-15.0.jar
Binary files differ
diff --git a/common/tools-common/Android.mk b/common/tools-common/Android.mk
index 4669f0e..505aacf 100644
--- a/common/tools-common/Android.mk
+++ b/common/tools-common/Android.mk
@@ -1,3 +1,17 @@
+# Copyright (C) 2014 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)
@@ -7,6 +21,7 @@
LOCAL_SRC_FILES := tools-common-prebuilt.jar
LOCAL_IS_HOST_MODULE := true
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_BUILT_MODULE_STEM := javalib.jar
LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
include $(BUILD_PREBUILT)
diff --git a/common/tradefed/PREBUILT b/common/tradefed/PREBUILT
index 4df0d32..d3f4bdb 100644
--- a/common/tradefed/PREBUILT
+++ b/common/tradefed/PREBUILT
@@ -1,4 +1,4 @@
The object in this prebuilt directory can be rebuilt from
platform/tools/tradefederation
-From the revision bdfc46aa14b33f907f60202604c3667940c5c97a
+From the revision 0d9989f68c8dc9999382ffc74d44f7789a3f4926
diff --git a/common/tradefed/tradefed-prebuilt.jar b/common/tradefed/tradefed-prebuilt.jar
index 04424f3..57f3af3 100644
--- a/common/tradefed/tradefed-prebuilt.jar
+++ b/common/tradefed/tradefed-prebuilt.jar
Binary files differ
diff --git a/common/ub-janktesthelper/PREBUILT b/common/ub-janktesthelper/PREBUILT
index 8f68de4..d9f7f09 100644
--- a/common/ub-janktesthelper/PREBUILT
+++ b/common/ub-janktesthelper/PREBUILT
@@ -1,4 +1,6 @@
The object in this prebuilt directory can be rebuilt from
- platform/frameworks/uiautomator
+ platform/frameworks/janktesthelper
-From the revision c2a3355b0ab65b7118c07d1f638f57d3bdb8fa78
+From the revision 175048e426ece2073961c43dcc950f38208434a3
+
+Prebuilt jar obtained from ub-support-test@1852709
diff --git a/common/ub-janktesthelper/ub-janktesthelper.jar b/common/ub-janktesthelper/ub-janktesthelper.jar
index 3073253..66e0f5c 100644
--- a/common/ub-janktesthelper/ub-janktesthelper.jar
+++ b/common/ub-janktesthelper/ub-janktesthelper.jar
Binary files differ
diff --git a/common/ub-uiautomator/PREBUILT b/common/ub-uiautomator/PREBUILT
index 2c08bc6..d520948 100644
--- a/common/ub-uiautomator/PREBUILT
+++ b/common/ub-uiautomator/PREBUILT
@@ -1,6 +1,6 @@
The object in this prebuilt directory can be rebuilt from
platform/frameworks/uiautomator
-From the revision f59d805b6e30b43b47200fb7950507af6e902887
+From the revision 0dcd34389ad7498487acd11a14a3662f9e4cecd3
-Prebuilt jar obtained from uiautomator@1695449
+Prebuilt jar obtained from uiautomator@1871656
diff --git a/common/ub-uiautomator/ub-uiautomator.jar b/common/ub-uiautomator/ub-uiautomator.jar
index 75ec57e..69c3213 100644
--- a/common/ub-uiautomator/ub-uiautomator.jar
+++ b/common/ub-uiautomator/ub-uiautomator.jar
Binary files differ
diff --git a/darwin-x86/futility/MODULE_LICENSE_BSD_LIKE b/darwin-x86/futility/MODULE_LICENSE_BSD_LIKE
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/darwin-x86/futility/MODULE_LICENSE_BSD_LIKE
diff --git a/darwin-x86/futility/PREBUILT b/darwin-x86/futility/PREBUILT
new file mode 100644
index 0000000..30b452c
--- /dev/null
+++ b/darwin-x86/futility/PREBUILT
@@ -0,0 +1,2 @@
+The binaries in this prebuilt directory can be rebuilt using
+the source in external/vboot_reference with build command "make futility-host".
diff --git a/darwin-x86/futility/futility b/darwin-x86/futility/futility
new file mode 100755
index 0000000..26f2d2d
--- /dev/null
+++ b/darwin-x86/futility/futility
Binary files differ
diff --git a/linux-x86/futility/MODULE_LICENSE_BSD_LIKE b/linux-x86/futility/MODULE_LICENSE_BSD_LIKE
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/linux-x86/futility/MODULE_LICENSE_BSD_LIKE
diff --git a/linux-x86/futility/PREBUILT b/linux-x86/futility/PREBUILT
new file mode 100644
index 0000000..30b452c
--- /dev/null
+++ b/linux-x86/futility/PREBUILT
@@ -0,0 +1,2 @@
+The binaries in this prebuilt directory can be rebuilt using
+the source in external/vboot_reference with build command "make futility-host".
diff --git a/linux-x86/futility/futility b/linux-x86/futility/futility
new file mode 100755
index 0000000..4c44275
--- /dev/null
+++ b/linux-x86/futility/futility
Binary files differ
diff --git a/scripts/vboot_signer/vboot_signer.sh b/scripts/vboot_signer/vboot_signer.sh
new file mode 100755
index 0000000..1fc4eed
--- /dev/null
+++ b/scripts/vboot_signer/vboot_signer.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+usage()
+{
+ echo usage: $0 futility input.img key.vbpubk key.vbprivk output.keyblock output.img
+}
+
+cleanup()
+{
+ rm -f ${EMPTY}
+}
+
+if [ "$#" -ne 6 ]; then
+ echo ERROR: invalid number of arguments
+ usage
+ exit 1
+fi
+
+futility=$1
+input=$2
+pubkey=$3
+privkey=$4
+keyblock=$5
+output=$6
+
+EMPTY=$(mktemp /tmp/tmp.XXXXXXXX)
+trap cleanup EXIT
+echo " " > ${EMPTY}
+
+echo signing ${input} with ${privkey} to generate ${output}
+${futility} vbutil_keyblock --pack ${keyblock} --datapubkey ${pubkey} --signprivate ${privkey}
+if [ $? -ne 0 ]; then
+ echo ERROR: unable to generate keyblock
+ exit $?
+fi
+
+${futility} vbutil_kernel --pack ${output} --keyblock ${keyblock} --signprivate ${privkey} --version 1 --vmlinuz ${input} --config ${EMPTY} --arch arm --bootloader ${EMPTY} --flags 0x1
+if [ $? -ne 0 ]; then
+ echo ERROR: unable to sign image
+ exit $?
+fi
+