Commit Graph

299 Commits

Author SHA1 Message Date
Xavier Ducrohet
8361bb0dfa Update build-tools and support for multidex.
Add the script to run multi-dex manually in build tools
Update non-maven support package to .0.1 to release a version
with the fixed multi-dex support lib.

Change-Id: I78c84e0d999855f9fc20fadfa21647e570a9f8c9
2014-10-29 11:07:40 -07:00
Xavier Ducrohet
3ad4b1f733 Update build tools version to 21.1.0. DO NOT MERGE.
Change-Id: Ib3dc18f67dc26b157747db78f073d892d9a998f3
2014-10-27 20:10:52 -07:00
Xavier Ducrohet
e07505bf02 Update Build Tools version to <API>.0.2. DO NOT MERGE.
This for the release that fixes the aapt crash on windows.

Change-Id: I4a8e7d672cf03a48763794c4d559130659d5833b
2014-10-21 09:18:45 -07:00
Xavier Ducrohet
946bfb51c0 Update Build Tools version to <API>.0.1. DO NOT MERGE.
This for the release that fixes the aapt crash on windows.

Change-Id: I983a5f084d6786bd0a8c0676b64001d7be6aa3d3
2014-10-17 15:48:37 -07:00
Deepanshu Gupta
2c34d62a0c Update LayoutLib API level to 12.
Change-Id: I7e392515939728251424d44d5957f95bdf3eb741
2014-10-06 16:39:12 -07:00
Xavier Ducrohet
91909fae54 Prepare the SDK component version numbers.
Change-Id: I2577ec690533e6b45a95b38c6cc0f82cb0981c5b
2014-09-22 18:55:19 -07:00
Siva Velusamy
bd2bea18ab Update revision of Android SDK USB driver for Windows
Rev 11 adds Project Tango (generic) drivers

(cherry picked from commit 05467d3526)

Change-Id: I458281bcb5294e587f100ec60d73d30c341659ba
2014-09-15 10:52:19 -07:00
Ji-Hwan Lee
4f583b9d11 am ad42c9e9: Proper resolution of conflict for 8062092a
* commit 'ad42c9e905306982a0c38c32088da20e69fa200e':
  Proper resolution of conflict for 8062092a
2014-06-23 10:33:57 +00:00
Ji-Hwan Lee
ad42c9e905 Proper resolution of conflict for 8062092a
Bug: 15793651
Change-Id: Ib618a9eb179dae3e2284eb8cf19a2b9216345708
2014-06-23 15:40:08 +09:00
Ed Heyl
ebfd9306c1 am 767f57dc: resolved conflicts for 8062092a
* commit '767f57dcaf7eedc012981a52f14e0ba7a286587f':
  Update revision of Android SDK USB driver for Windows. DO NOT MERGE.
2014-06-21 19:53:11 +00:00
Ed Heyl
767f57dcaf resolved conflicts for 8062092a
Change-Id: Ibbe3d25e62b2c59b4dc89b198915869b61da6bf5
2014-06-21 12:50:04 -07:00
Raphael Moll
8062092a46 Update revision of Android SDK USB driver for Windows. DO NOT MERGE.
Rev 9 adds the Glass PID.

(cherry picked from commit 8221674986)

Change-Id: I63bb199b28c20fa791d3b1f9c70d8ea1633f9a6d
2014-06-20 08:27:28 -07:00
Xavier Ducrohet
3be08760da am 44602376: Merge "RC version for build-tools." into lmp-preview-dev
* commit '44602376adfca1c2c3c54af2bc4c905a8f486225':
  RC version for build-tools.
2014-06-17 01:23:39 +00:00
Xavier Ducrohet
44602376ad Merge "RC version for build-tools." into lmp-preview-dev 2014-06-16 15:46:16 +00:00
Xavier Ducrohet
91b2cf39f1 RC version for build-tools.
Because the branch is still 19/20+codename but we
want to release 21.0.0 rc1 we remove the placeholder
temporarily.

Change-Id: I8016b23e27aa5673f0632d83ab1c8e70024ed8f7
2014-06-16 18:16:40 -07:00
Raphael Moll
1669109705 Move SDK system-image source.prop_templates in their own folder.
This allows to have a different rule to generate the source.properties
based on the templates and place them in a directory that depends on
the current target CPU ABI. In turn this prevents the build from
mixing different source.props when building different targets.

(cherry picked from commit 26bcf6a511)

Change-Id: I6e424c16fba17f5d2f37742b7d32208b126bea77
2014-06-14 21:31:13 -07:00
Raphael Moll
9cec99d954 am ea21b816: am 28748be7: Merge "Generate api-versions.xml for lint."
* commit 'ea21b8169062fecf0bf32abafc5892ad3beb8238':
  Generate api-versions.xml for lint.
2014-06-09 23:52:02 +00:00
Raphael Moll
4f8a38ed7a Generate api-versions.xml for lint.
Depends on:
- tools/base      I747d27e998c6dbd61dd17c44bfc747c9542e33d1
- tools/buildSrc  I400f4b6c146836ba30e6e7985ca6c9894985a8cb
- prebuilts/tools Ia4b0c477cf6f4788de610be017a9f5b43d73486c

Change-Id: I3f791d5e1d0ea893cdb5969854d9ae99d5fbb5b7
2014-06-09 15:59:58 -07:00
Raphael Moll
fcabb6e7aa am 95671f78: am 03afa4d6: Merge "Android USB driver: support 4EE7 (Nexus adb only)."
* commit '95671f78a5a32307aee79f3e86c62f92c26ac49a':
  Android USB driver: support 4EE7 (Nexus adb only).
2014-06-06 22:23:19 +00:00
Raphael Moll
700c6fd81d Android USB driver: support 4EE7 (Nexus adb only).
Bug: b/14988808
Change-Id: Ib855f063c949649c059da09483f782d09fbf3d2c
2014-06-06 12:50:21 -07:00
Raphael Moll
adcf12ed08 am 4000df93: am 6ab8ef21: Merge "Move SDK system-image source.prop_templates in their own folder."
* commit '4000df931bb1b0f9a9e37430212124a9c37e6972':
  Move SDK system-image source.prop_templates in their own folder.
2014-06-04 21:58:54 +00:00
Raphael Moll
95a5c56c8f am 728f321c: Merge "Add Build-Tools runtime.properties file."
* commit '728f321cb94220e1f7d1d72759b6c6b342152c15':
  Add Build-Tools runtime.properties file.
2014-06-04 09:55:53 +00:00
Raphael Moll
26bcf6a511 Move SDK system-image source.prop_templates in their own folder.
This allows to have a different rule to generate the source.properties
based on the templates and place them in a directory that depends on
the current target CPU ABI. In turn this prevents the build from
mixing different source.props when building different targets.

Change-Id: I4a1d9f47426c94f376947ddae8be9f5549331616
2014-06-03 17:30:16 -07:00
Raphael Moll
37433ac223 Add Build-Tools runtime.properties file.
Change-Id: I5addf44a2ea3dbb91df5a49f6fcb10e75047fa82
2014-06-03 13:46:51 -07:00
Raphael Moll
267ddd50d7 am 937cfb42: am 6e56697c: Merge "Ability to generate SDK system-images for arm64 and x86_64"
* commit '937cfb42602c081143e1854ba5f67e18b2f97b46':
  Ability to generate SDK system-images for arm64 and x86_64
2014-05-28 01:59:48 +00:00
Raphael Moll
937cfb4260 am 6e56697c: Merge "Ability to generate SDK system-images for arm64 and x86_64"
* commit '6e56697cb229cd8c163583a03259a6787f60a84a':
  Ability to generate SDK system-images for arm64 and x86_64
2014-05-28 01:57:55 +00:00
Raphael Moll
4986fd4fdd Ability to generate SDK system-images for arm64 and x86_64
(Cherry-picked from 40c7126e7c)

Change-Id: I2715a668271ed88fcd0c8c97ac35d05fcdd34a06
2014-05-27 16:10:14 -07:00
Xavier Ducrohet
c32cb7040f am f8a99a45: Reset version number to .0.0 for new API level SDK.
* commit 'f8a99a451bfbdcf75bb2c835f17cc8471321cbe2':
  Reset version number to .0.0 for new API level SDK.
2014-05-22 16:46:31 +00:00
Xavier Ducrohet
f8a99a451b Reset version number to .0.0 for new API level SDK.
Change-Id: I0765de9dbb4f354c0b0a411b71bfcecb6797c632
2014-05-22 09:27:02 -07:00
Raphael Moll
6f2b614418 am f7863319: am 261307be: resolved conflicts for merge of bf164835 to stage-aosp-master
* commit 'f786331925d50c2235f298e39880a9a05670b0dd':
  Fix SDK build.
2014-05-21 00:01:29 +00:00
Raphael Moll
f786331925 am 261307be: resolved conflicts for merge of bf164835 to stage-aosp-master
* commit '261307bebe8986599055bb97d5587977c8da53eb':
  Fix SDK build.
2014-05-20 23:35:46 +00:00
Raphael Moll
261307bebe resolved conflicts for merge of bf164835 to stage-aosp-master
Change-Id: I3c380b1ddae5e088985513398d7eb6274d8426eb
2014-05-20 16:29:29 -07:00
Raphael Moll
e9a7920ca4 Fix SDK build.
development's sdk.atree depends on the generated file
/sdk/files/sdk_files_NOTICE.txt which was accumulating
all the tools notices.

However this file isn't generated anymore.
This replaces it by a static file.

This is only good as a temporary measure to fix the build.
The proper fix is to recreate the SDK rule to generate the
combined NOTICE.txt and move it in development.git

Change-Id: I27e4f38e756b81b002d16dfac5ccaa54a4463786
2014-05-20 14:10:47 -07:00
Raphael Moll
40c7126e7c Ability to generate SDK system-images for arm64 and x86_64
Change-Id: I2715a668271ed88fcd0c8c97ac35d05fcdd34a06
2014-05-19 10:25:09 -07:00
Raphael Moll
136f00c234 am 7401fa16: am 8aa49aef: am f9f829e5: Merge "SDK: support generating repository XML with latest XSD."
* commit '7401fa161f9f6bf66965cc71528ae1cdeb99b620':
  SDK: support generating repository XML with latest XSD.
2014-05-16 20:18:12 +00:00
Raphael Moll
7401fa161f am 8aa49aef: am f9f829e5: Merge "SDK: support generating repository XML with latest XSD."
* commit '8aa49aef8adb24a1b977d89b60a48a781e4e6674':
  SDK: support generating repository XML with latest XSD.
2014-05-16 20:12:42 +00:00
Raphael Moll
8aa49aef8a am f9f829e5: Merge "SDK: support generating repository XML with latest XSD."
* commit 'f9f829e51afe3906458a81cb4efb75a051c64c04':
  SDK: support generating repository XML with latest XSD.
2014-05-16 20:09:40 +00:00
Raphael Moll
ea40d2f4c5 SDK: support generating repository XML with latest XSD.
The latest version of the repository XSD changes:
- archive attributes (os/arch) are now element (host-os)
- system images are not longer in the repository.xml and
  get their own XML file.

Change-Id: If5820a84d5c754b816b17b5713bbdb2597736eff
2014-05-15 17:49:02 -07:00
Xavier Ducrohet
c514a33d82 am 4c3d9d23: am 26b61880: Move support lib to 19.2.0. Do not merge.
* commit '4c3d9d23c20ca105f129c90b0b9cfa2931d42527':
  Move support lib to 19.2.0. Do not merge.
2014-04-11 00:31:00 +00:00
Xavier Ducrohet
26b6188098 Move support lib to 19.2.0. Do not merge.
Change-Id: Ic1165a1b3c2165fea64a3fc22684ad6abbb24af7
2014-04-10 16:41:42 -07:00
Raphael Moll
9342101807 am de76aab8: am f03f35fe: Update support library version to 19.1.0.
* commit 'de76aab81370f202e2de34da71f2bcd0764548e7':
  Update support library version to 19.1.0.
2014-03-26 20:17:03 +00:00
Raphael Moll
f03f35fe24 Update support library version to 19.1.0.
Change-Id: Ia6d64b03c7bd9f4faaa59551c15e451b9ad297cd
2014-03-26 20:01:30 +00:00
Raphael Moll
5cdebab383 am 56142356: Merge "Update revision of Android SDK USB driver for Windows."
* commit '561423569c11698698450b87a91c7a94d5077e5f':
  Update revision of Android SDK USB driver for Windows.
2014-03-06 22:58:22 +00:00
Raphael Moll
273f790b6b am 56142356: Merge "Update revision of Android SDK USB driver for Windows."
* commit '561423569c11698698450b87a91c7a94d5077e5f':
  Update revision of Android SDK USB driver for Windows.
2014-01-31 12:17:13 +00:00
Raphael Moll
56a3664913 Update revision of Android SDK USB driver for Windows. DO NOT MERGE.
Rev 9 adds the Glass PID.

(Merged from AOSP 8221674986)
Change-Id: I1ec7985b9715d813f6442dad41a27233d8dd4822
2014-01-30 12:27:18 -08:00
Raphael Moll
8221674986 Update revision of Android SDK USB driver for Windows.
Rev 9 adds the Glass PID.

Change-Id: I1ec7985b9715d813f6442dad41a27233d8dd4822
2014-01-30 10:16:57 -08:00
Xavier Ducrohet
0a56aecdbb Update build tools to 19.0.2
Change-Id: I339c292aece1101a6afaf89db20a9d985427e561
2014-01-02 16:24:41 -08:00
Raphael Moll
cfed45de87 am 51fa6c5c: am aa198e6c: am 3519ce6e: Adjust SDK revisions for KLP MR1 for platform and samples
* commit '51fa6c5c5ea28658f61982cc9374d616f32ef2a2':
  Adjust SDK revisions for KLP MR1 for platform and samples
2013-12-05 02:45:02 +00:00
Raphael Moll
3519ce6eb3 Adjust SDK revisions for KLP MR1 for platform and samples
Platform changes from 19 r1 to 19 r2.
Samples  changes from 19 r1 to 19 r2.

Change-Id: Ia391fef04468211f460f3e8d6ab83e0a4dc12a70
2013-11-27 13:11:16 -08:00
Xavier Ducrohet
888bd6a124 Merge "Prepare SDK for KLP MR1. Do not merge." into klp-dev 2013-11-26 19:48:45 +00:00