| commit | 9b1b4c26b538391cdc08adbf60a0e847aecfa893 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Tue Feb 21 22:21:04 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 21 22:21:04 2017 +0000 |
| tree | de2ce45c0168b0edf2bb8932d7cb5cff6e285762 | |
| parent | 50d649583ffa05c7c143ff72869fd79a79a82e72 [diff] | |
| parent | 392c38c7b87e3a371d5edd8cd4ccbd46b99db9ab [diff] |
Merge "Revert "Remove futility prebuilts."" am: 392c38c7b8 Change-Id: Ifb62a351c7353cbf13310ad9784ff5b1d89329d4
diff --git a/common/layoutlib_api/PREBUILT b/common/layoutlib_api/PREBUILT index 50f942f..c111a1c 100644 --- a/common/layoutlib_api/PREBUILT +++ b/common/layoutlib_api/PREBUILT
@@ -1,4 +1,4 @@ The object in this prebuilt directory can be rebuilt from platform/tools/base/layoutlib_api/ -From: https://android.googlesource.com/platform/tools/base/+/60737ae80db39b99db2a9da3aa93ca7042e9fbc8 +From: https://android.googlesource.com/platform/tools/base/+/e76e82faa103006187af42e3c8d6c2212b9970ad
diff --git a/common/layoutlib_api/layoutlib_api-prebuilt.jar b/common/layoutlib_api/layoutlib_api-prebuilt.jar index cf6513d..a9b6ed0 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 7ecf865..15bb418 100644 --- a/common/layoutlib_api/layoutlib_api-sources.jar +++ b/common/layoutlib_api/layoutlib_api-sources.jar Binary files differ
diff --git a/common/ninepatch/PREBUILT b/common/ninepatch/PREBUILT index 921b29a..6e4bc1e 100644 --- a/common/ninepatch/PREBUILT +++ b/common/ninepatch/PREBUILT
@@ -1,4 +1,4 @@ The object in this prebuilt directory can be rebuilt from - platform/sdk/ninepatch/ + platform/tools/base/ninepatch -From: http://android.git.kernel.org/?p=platform/sdk.git;a=commit;h=795a4ad26824b0e553ca49161a8b4999b8181f8d +From: https://android.googlesource.com/platform/tools/base/+/9bb80dcd51e8e953590473a469a67b3ec8f2b736
diff --git a/common/ninepatch/ninepatch-prebuilt.jar b/common/ninepatch/ninepatch-prebuilt.jar index cf3ced3..5e010da 100644 --- a/common/ninepatch/ninepatch-prebuilt.jar +++ b/common/ninepatch/ninepatch-prebuilt.jar Binary files differ