LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,401 Commits 2 Branches 0 Tags
56d7f3949e928e91da99495d5aa16aad0bc38c1d
Commit Graph

222 Commits

Author SHA1 Message Date
Deepanshu Gupta
48eedc1b6e am aaa7b09b: am eb80f595: am 77073860: am 686b9b0f: am 13a2b70e: Merge "Update SDK Pkg Revision for API 21 to 2" into lmp-dev 
* commit 'aaa7b09b7618666cb39331a839ec40ec31dce161':
  Update SDK Pkg Revision for API 21 to 2
 2014-11-21 12:18:47 +00:00
Deepanshu Gupta
77073860da am 686b9b0f: am 13a2b70e: Merge "Update SDK Pkg Revision for API 21 to 2" into lmp-dev 
* commit '686b9b0f1a38e0a6686116946b1b56d9d826198f':
  Update SDK Pkg Revision for API 21 to 2
 2014-11-21 03:31:15 +00:00
Deepanshu Gupta
13a2b70ee5 Merge "Update SDK Pkg Revision for API 21 to 2" into lmp-dev 2014-11-19 22:30:30 +00:00
Deepanshu Gupta
b7764ef30d Update SDK Pkg Revision for API 21 to 2 
Change-Id: I4241382e8251308dee07f971eda84eda45c90659
 2014-11-19 13:05:28 +00:00
Xavier Ducrohet
55c4621168 am fa26ce84: am a19e1e2c: Update build tools version to 21.1.2. DO NOT MERGE. 
* commit 'fa26ce84907a7c7afa905c0c515617115e4d9f13':
  Update build tools version to 21.1.2. DO NOT MERGE.
 2014-11-15 06:05:32 +00:00
Xavier Ducrohet
a19e1e2c8f Update build tools version to 21.1.2. DO NOT MERGE. 
Change-Id: I5116a3ea116656db5a64fdf2220e4bd0eb88ad93
 2014-11-14 17:04:20 -08:00
Xavier Ducrohet
35afa6de9a am 2680677b: am 0c72bc36: Update support extra revision. DO NOT MERGE. 
* commit '2680677b96997a755f2d3ebd8afe267fa6524f97':
  Update support extra revision. DO NOT MERGE.
 2014-11-13 20:57:29 +00:00
Xavier Ducrohet
0c72bc368f Update support extra revision. DO NOT MERGE. 
Change-Id: I93a2c673dde63df1c36498a7aea63472ed83c48c
 2014-11-12 17:44:07 -08:00
Adam Lesinski
6a6f741b7b am 5e44c883: am 94527b09: am ed6aaf3f: Merge "Add split-select tool to SDK build." into lmp-mr1-dev 
* commit '5e44c8833f54026fca6a821577cebdef086ee356':
  Add split-select tool to SDK build.
 2014-11-11 01:23:13 +00:00
Adam Lesinski
ed6aaf3f72 Merge "Add split-select tool to SDK build." into lmp-mr1-dev 2014-11-11 00:56:36 +00:00
Deepanshu Gupta
b2a7147d8e am 3ecffe3b: am 8fbc5f53: am 058f1f0f: am 077d2052: am e3189c68: Update LayoutLib version for API 21 to 2. 
* commit '3ecffe3b64b793696854509d28240caf41d9fd17':
  Update LayoutLib version for API 21 to 2.
 2014-11-11 00:38:29 +00:00
Deepanshu Gupta
e3189c68b0 Update LayoutLib version for API 21 to 2. 
Change-Id: Icb24cb56a34def1c550b7f38fe6f2943c49d3a03
 2014-11-10 20:19:15 +00:00
Adam Lesinski
d155da9790 Add split-select tool to SDK build. 
Change-Id: I3889cb62587cdd8479cd91cee2412703f90cd91c
 2014-11-05 11:34:03 -08:00
Xavier Ducrohet
5b7f5d2bc4 Update build-tools revision. DO NOT MERGE. 
Change-Id: I2b59607e7cb24e3c09a2eb430380443d9c3e64d5
 2014-10-31 13:48:51 -07:00
Xavier Ducrohet
0a91e35328 am bf541eb5: am f75191cb: am 0d574614: am 25907e2a: am 8361bb0d: Update build-tools and support for multidex. 
* commit 'bf541eb5107f246782a9ce88f5a460ecb927b851':
  Update build-tools and support for multidex.
 2014-10-31 00:24:39 +00:00
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
ea6660e2da resolved conflicts for merge of 489fb042 to master 
Change-Id: I0e05d4c354053050453bcc1e8f8564758667abc3
 2014-09-23 13:52:58 -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
Siva Velusamy
b39c0c87ad am af7cf6cb: am ad8e06e1: am 372c5b71: Merge "Update revision of Android SDK USB driver for Windows" 
* commit 'af7cf6cbef3ad9f8a69bd9442da6de1d12a0b2da':
  Update revision of Android SDK USB driver for Windows
 2014-09-12 18:04:14 +00:00
Siva Velusamy
af7cf6cbef am ad8e06e1: am 372c5b71: Merge "Update revision of Android SDK USB driver for Windows" 
* commit 'ad8e06e199eeb8237d8e95ead519b3429cc753af':
  Update revision of Android SDK USB driver for Windows
 2014-09-11 14:33:30 +00:00
Siva Velusamy
05467d3526 Update revision of Android SDK USB driver for Windows 
Rev 11 adds Project Tango (generic) drivers

Change-Id: Idfb99426ec3553fee2a8d2ec2d04dba029732ebe
 2014-09-10 14:18:24 -07:00
Deepanshu Gupta
62012f9502 resolved conflicts for merge of f5dcf2f1 to master 
Change-Id: Ia2dc136400e5e67df148d2f4b196d9d458b18ef6
 2014-07-18 15:19:42 -07:00
Deepanshu Gupta
f5dcf2f16d Update platform SDK component to revision 4. 
Also update LayoutLib Api version.

Change-Id: I864680260450c6f37e02744205f755035c96c381
 2014-07-09 17:49:04 -07:00
Deepanshu Gupta
2c353e7529 Update platform SDK component to L 
Update platform package version to 3 and LayoutLib Api to 11

Change-Id: I1e32dc109b8d5c3551a84e960209904048b48a77
 2014-07-09 16:49:28 -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
Tor Norbye
8ec5006267 Update api-versions.xml for LMP preview 
This file is used by lint to flag calls and field accesses
that were introduced in an API level higher than the current
minSdkVersion of the app.

Change-Id: I627f9df35cc4a04045b2a5219c2738c1031b6864
 2014-06-18 10:36:20 -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