commit | 90d3274fa408705f320dbdf4b47485cbc8e67977 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Feb 13 14:43:28 2018 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Feb 13 14:43:28 2018 +0000 |
tree | 6211a12a8f673c8b89d4eb996db9c76c5a1b5cdd | |
parent | 71a653da9cba35d223ad615a3bc0e25dba542fc9 [diff] | |
parent | d561161ab39e785f6f078b83573b05dc58f7699f [diff] |
Merge "Update layoutlib prebuilts"
diff --git a/common/layoutlib_api/PREBUILT b/common/layoutlib_api/PREBUILT index 5823912..c697fa0 100644 --- a/common/layoutlib_api/PREBUILT +++ b/common/layoutlib_api/PREBUILT
@@ -1,4 +1 @@ -The object in this prebuilt directory can be rebuilt from - platform/tools/base/layoutlib-api/ - -From: https://android.googlesource.com/platform/tools/base/+/12b84af5358d099479fac7614807446079ddccb6 +layoutlib_api-prebuilt.jar was built from tools/base/layoutlib-api@e25f4e4ac2360ed77ad5de537b1529b037c49376
diff --git a/common/layoutlib_api/layoutlib_api-prebuilt.jar b/common/layoutlib_api/layoutlib_api-prebuilt.jar index c2f65a4..f42172f 100644 --- a/common/layoutlib_api/layoutlib_api-prebuilt.jar +++ b/common/layoutlib_api/layoutlib_api-prebuilt.jar Binary files differ
diff --git a/common/layoutlib_api/layoutlib_api-sources.jar b/common/layoutlib_api/layoutlib_api-sources.jar index be2963a..7167fb4 100644 --- a/common/layoutlib_api/layoutlib_api-sources.jar +++ b/common/layoutlib_api/layoutlib_api-sources.jar Binary files differ
diff --git a/common/sdk-common/PREBUILT b/common/sdk-common/PREBUILT index afc106f..eefa650 100644 --- a/common/sdk-common/PREBUILT +++ b/common/sdk-common/PREBUILT
@@ -1,4 +1 @@ -sdk-common.jar in this prebuilt directory can be rebuilt from - platform/tools/base/sdk-common - -From version cbf5c6e3ef5f07460188a839366209f7a9cbef44 the platform/tools/base/sdk-common. +sdk-common.jar was built from tools/base/sdk-common@54d8351a747f2a5dabc3c36012355d4b54f81ae3
diff --git a/common/sdk-common/sdk-common-sources.jar b/common/sdk-common/sdk-common-sources.jar index ed7606f..7db9af4 100644 --- a/common/sdk-common/sdk-common-sources.jar +++ b/common/sdk-common/sdk-common-sources.jar Binary files differ
diff --git a/common/sdk-common/sdk-common.jar b/common/sdk-common/sdk-common.jar index 5175ba1..8765e5e 100644 --- a/common/sdk-common/sdk-common.jar +++ b/common/sdk-common/sdk-common.jar Binary files differ
diff --git a/common/tools-common/PREBUILT b/common/tools-common/PREBUILT index 34a9096..03bfa2f 100644 --- a/common/tools-common/PREBUILT +++ b/common/tools-common/PREBUILT
@@ -1,5 +1 @@ -tools-common-prebuilt.jar in this prebuilt directory was copied from - platform/prebuilts/devtools/tools/lib/common.jar - -From version 8303c1e4221a94bdc7589d1aef884fada1484fa6 of the platform/prebuilts/devtools project. - +tools-common-prebuilt.jar was built from tools/base/common@54d8351a747f2a5dabc3c36012355d4b54f81ae3
diff --git a/common/tools-common/tools-common-prebuilt-sources.jar b/common/tools-common/tools-common-prebuilt-sources.jar index 8b4b78d..eed9d89 100644 --- a/common/tools-common/tools-common-prebuilt-sources.jar +++ b/common/tools-common/tools-common-prebuilt-sources.jar Binary files differ
diff --git a/common/tools-common/tools-common-prebuilt.jar b/common/tools-common/tools-common-prebuilt.jar index ddc4ac7..9543e85 100644 --- a/common/tools-common/tools-common-prebuilt.jar +++ b/common/tools-common/tools-common-prebuilt.jar Binary files differ