LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,407 Commits 2 Branches 0 Tags
c3c6324ebeaa17a0975f5acf9f129382808086d5
Commit Graph

754 Commits

Author SHA1 Message Date
Ji-Hwan Lee
7894d8eeac am 5ece703b: Merge "Fix sdk build, really this time" into klp-modular-dev-plus-aosp 
* commit '5ece703b190205243f9601a3eddb287ec808a084':
  Fix sdk build, really this time
 2014-06-22 16:49:42 +00:00
Griff Hazen
106d4ca41d am 5da8165a: am 9872c0c7: Move all wearable samples to development/samples/wearable 
* commit '5da8165a4600c62df835e9f59fc61e2d35c7eae4':
  Move all wearable samples to development/samples/wearable
 2014-06-22 09:52:31 +00:00
Griff Hazen
5da8165a46 am 9872c0c7: Move all wearable samples to development/samples/wearable 
* commit '9872c0c7c0383c0d940bab2862c9468af26ee638':
  Move all wearable samples to development/samples/wearable
 2014-06-22 09:02:21 +00:00
Xavier Ducrohet
620a756fcc am ac219503: Add more tools to platform-tools 
* commit 'ac21950368a56dbf1a378211e106d7c54056e4cc':
  Add more tools to platform-tools
 2014-06-21 22:29:31 +00:00
Griff Hazen
1ad24024b3 am e46688e3: am 2def7d2a: Add first wearable sample to sdk atree 
* commit 'e46688e36ed645036d7283be54a9e7a5da311995':
  Add first wearable sample to sdk atree
 2014-06-21 20:19:13 +00:00
Griff Hazen
e46688e36e am 2def7d2a: Add first wearable sample to sdk atree 
* commit '2def7d2a2a0e9eacf49819c9cba3e5b188b061c3':
  Add first wearable sample to sdk atree
 2014-06-21 20:15:49 +00:00
Ji-Hwan Lee
b791183533 am efbbd1d9: Merge "Fix sdk builds" into klp-modular-dev-plus-aosp 
* commit 'efbbd1d98b2e16b8f0e2413460dcde92c77faf5a':
  Fix sdk builds
 2014-06-21 17:00:01 +00:00
Xavier Ducrohet
043a8dd414 am b931fca7: resolved conflicts for merge of f78598f7 to klp-modular-dev-plus-aosp 
* commit 'b931fca7ebde805e8f070e25f5d8bda774a4614b':
  Fix repo script to ignore tools. DO NOT MERGE.
 2014-06-21 00:57:00 +00:00
Xavier Ducrohet
b931fca7eb resolved conflicts for merge of f78598f7 to klp-modular-dev-plus-aosp 
Change-Id: I8657c95b169320957629b492fef11994227b3c56
 2014-06-20 17:51:14 -07:00
Griff Hazen
2def7d2a2a Add first wearable sample to sdk atree 
Bug: 15591212

Change-Id: Ic74e8e821d7941d403dc4d83aa33f23cf671c226
 2014-06-20 16:04:46 -07:00
Trevor Johns
4a71ff571d am ee811814: Update sdk.atree with new samples for LMP Preview release 
* commit 'ee8118144402226bb3fda9c78a27de43140e92ad':
  Update sdk.atree with new samples for LMP Preview release
 2014-06-20 19:14:22 +00:00
Raphael Moll
3f3f34dc0e Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE. 
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

Conflicts:
	build/sdk-android-arm64-v8a.atree
	build/sdk-android-x86.atree
	build/sdk-android-x86_64.atree
	sys-img/images_arm64-v8a_source.prop_template
	sys-img/images_x86_64_source.prop_template
 2014-06-20 08:49:37 -07:00
Raphael Moll
71ad7c8f4e Fix SDK repo to prevent mixing different targets. DO NOT MERGE. 
This makes sure that sdk-repo-*.zip doesn't exist to
avoid merging into an existing one.

Also fix a warning when generating the repo.xml files.

(cherry picked from commit 4df9f469f7)

Change-Id: I8ad6763ace0d6075a743b99fd65a5ae8b69bf3d5
 2014-06-20 08:38:23 -07:00
Raphael Moll
efbf1a3e28 SDK: support generating repository XML with latest XSD. DO NOT MERGE. 
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.

(cherry picked from commit ea40d2f4c5)

Change-Id: Id0363c446014a96a7f78c8e5500fae6092e97dc3
 2014-06-20 08:28:25 -07:00
Xavier Ducrohet
f78598f754 Fix repo script to ignore tools. DO NOT MERGE. 
(cherry picked from commit d81eb5d833)

Change-Id: I7dbd0db25b84a11c36fcd570935357b0e755555c
 2014-06-20 08:24:05 -07:00
Trevor Johns
ee81181444 Update sdk.atree with new samples for LMP Preview release 
Change-Id: I6bbafb05b39ee448bbe8f831bbbb58e364851c79
 2014-06-19 23:57:19 -07:00
Xavier Ducrohet
662133ebc4 am a9d69c6e: Merge "Package custom hardware.ini with armeabi-v7a images." into lmp-preview-dev 
* commit 'a9d69c6e2c26fbd5b9a88a970d9af24abd72fa62':
  Package custom hardware.ini with armeabi-v7a images.
 2014-06-20 00:44:29 +00:00
Xavier Ducrohet
a9d69c6e2c Merge "Package custom hardware.ini with armeabi-v7a images." into lmp-preview-dev 2014-06-20 00:01:43 +00:00
Xavier Ducrohet
7daf61b9b9 Package custom hardware.ini with armeabi-v7a images. 
Change-Id: I60d88374d0caba57f9ab3c589c758d983c099c2f
 2014-06-19 17:16:00 -07:00
Ji-Hwan Lee
5cd3de1cc6 Fix sdk builds 
Change-Id: Ifca3f430795bf002ecc7bf77b38c2336e578c5fc
 2014-06-21 17:19:49 +09:00
Ji-Hwan Lee
5ece703b19 Merge "Fix sdk build, really this time" into klp-modular-dev-plus-aosp 2014-06-19 22:55:19 +00:00
Ji-Hwan Lee
e3e3de0cef Fix sdk build, really this time 
Change-Id: I5cddf63a6dc30dee5185a3a6a4e352c574a87213
 2014-06-22 04:26:56 +09:00
Xavier Ducrohet
bb6f104abc am 3e36464b: Fix build: include sqlite3 in sdk builds. 
* commit '3e36464bbcccb88906be2cf89d1b323aa83e9c0f':
  Fix build: include sqlite3 in sdk builds.
 2014-06-18 10:18:37 +00:00
Xavier Ducrohet
c477cf4124 am 4049f60a: Fix windows build. 
* commit '4049f60aa764817ea0d70b8292b3503e19762839':
  Fix windows build.
 2014-06-18 10:18:34 +00:00
Xavier Ducrohet
20edcd3b33 am ebacf02e: Use renderscript prebuilts for windows. 
* commit 'ebacf02e88f7ec2bf77b671d14e1d524a2786e1b':
  Use renderscript prebuilts for windows.
 2014-06-18 10:18:14 +00:00
Xavier Ducrohet
3e36464bbc Fix build: include sqlite3 in sdk builds. 
This just enables sqlite3 to be build, doesn't
mean it gets packaged. (still controlled through
the atree).

Change-Id: Idf762427a0832dcb02586393cf92904d61d663db
 2014-06-18 00:33:21 -07:00
Xavier Ducrohet
4049f60aa7 Fix windows build. 
Windows build is based on linux and it needs
to delete the linux executable. sqlite3 moved
from tools to platform-tools so we need to delete it
from the right folder.

Change-Id: Ifae3b0e8972ba7ca316e6e8fd7908f6c8c11a271
 2014-06-17 22:01:07 -07:00
Xavier Ducrohet
ebacf02e88 Use renderscript prebuilts for windows. 
Change-Id: Ie487ff571a8552a166742824ba43c4c445c432f5
 2014-06-17 21:36:30 -07:00
Xavier Ducrohet
e263f439b6 am 0f0b786b: Move sqlite3 to platform-tools. 
* commit '0f0b786b5af31a7794eacc66eedb252d72490d86':
  Move sqlite3 to platform-tools.
 2014-06-18 03:33:24 +00:00
Xavier Ducrohet
0f0b786b5a Move sqlite3 to platform-tools. 
This was in the SDK tools before but it's really part of
the platform.

Change-Id: I2a88d288aec6fd1556a28db58976fc1c889efd35
 2014-06-17 20:25:57 -07:00
Xavier Ducrohet
c5e962866b am 9a258bce: Revert "Revert "Add cardview to support extra package."" 
* commit '9a258bce2cc829e3e80acc4680d7c7fb361f1435':
  Revert "Revert "Add cardview to support extra package.""
 2014-06-18 00:42:39 +00:00
Deepanshu Gupta
40c2c69bd8 resolved conflicts for merge of c91c719f to klp-modular-dev-plus-aosp 
Change-Id: I0c942398f6acecf072da1a2148fbc900a609e870
 2014-06-17 17:27:29 -07:00
Deepanshu Gupta
c91c719f91 am dd2dac36: am edf631de: Package renamed fonts. [DO NOT MERGE] 
* commit 'dd2dac3659cad1594ce3a72f10b1216424b62441':
  Package renamed fonts. [DO NOT MERGE]
 2014-06-18 00:15:40 +00:00
Deepanshu Gupta
dd2dac3659 am edf631de: Package renamed fonts. [DO NOT MERGE] 
* commit 'edf631dee4edd3c44cd4156ccb7974090c89b65d':
  Package renamed fonts. [DO NOT MERGE]
 2014-06-18 00:10:42 +00:00
Xavier Ducrohet
de91aa6a87 am fffa1541: Revert "Add cardview to support extra package." 
* commit 'fffa1541f10acef428b9b370b4b78b55c72fa306':
  Revert "Add cardview to support extra package."
 2014-06-17 23:15:15 +00:00
Xavier Ducrohet
9a258bce2c Revert "Revert "Add cardview to support extra package."" 
Also add cardview to the list of support lib in
build/Android.mk

This reverts commit fffa1541f1.

Change-Id: I25bf7ce9d42894933f3cbdf2cc8ae2369945b35b
 2014-06-17 16:14:47 -07:00
Xavier Ducrohet
fffa1541f1 Revert "Add cardview to support extra package." 
This reverts commit 1e396a5975.
 2014-06-17 16:09:48 -07:00
Xavier Ducrohet
af91cc72df am 1e396a59: Add cardview to support extra package. 
* commit '1e396a59756dd9900d1cacb14c1cd07ac4901453':
  Add cardview to support extra package.
 2014-06-17 19:21:50 +00:00
Xavier Ducrohet
1e396a5975 Add cardview to support extra package. 
Change-Id: I796857c19ff466d0d84b9c9901273068510c3fb6
 2014-06-17 12:12:16 -07:00
Xavier Ducrohet
06a5de5e8b am 6c9d1af8: Merge "Remove non-ready support libs. DO NOT MERGE." into klp-modular-dev 
* commit '6c9d1af8213394eb9458e71f2e6d62c4de716902':
  Remove non-ready support libs. DO NOT MERGE.
 2014-06-17 01:27:24 +00:00
Ying Wang
78e75a9abf Build system API stubs. 
Run "make android_system_stubs" to build the system API jar file.

Change-Id: I0c221e110683f9315f4082e68ed3835162f91320
 2014-06-16 15:04:22 -07:00
Deepanshu Gupta
edf631dee4 Package renamed fonts. [DO NOT MERGE] 
PS names of fonts are renamed to include the version number. This change
packages the fonts from the output directory of the script that modifies
the fonts.

Change-Id: I023fb0dfcf50698f80e26b7d476969c453fc4cc7
(cherry picked from commit 4100ca144d)
 2014-06-12 15:27:57 -07:00
Deepanshu Gupta
9e66bc405f am f7449cdb: Merge "Package renamed fonts again." into lmp-preview-dev 
* commit 'f7449cdb18aeef440c8b1e2d7e99ec9970fc7f8a':
  Package renamed fonts again.
 2014-06-12 16:54:21 +00:00
Raphael Moll
b4654552c5 am bbd9b96c: am 8235126e: am 9649c415: Merge "Change api-versions.xml generator source order." 
* commit 'bbd9b96cd10864554c5f3f9ab5e0e1bbf43442b6':
  Change api-versions.xml generator source order.
 2014-06-11 20:24:31 +00:00
Ying Wang
3016ff6d0a am c8ed8c25: am bcfa67e5: am 1e1b10ac: Merge "Switch to SDK_HOST_ARCH" 
* commit 'c8ed8c25bc796cd82fb1df0ea100e320a542eeb3':
  Switch to SDK_HOST_ARCH
 2014-06-11 19:26:28 +00:00
Raphael Moll
b6fbb4d0c9 am 9cec99d9: am ea21b816: am 28748be7: Merge "Generate api-versions.xml for lint." 
* commit '9cec99d9540822e68559e25b471bbe788352839d':
  Generate api-versions.xml for lint.
 2014-06-11 18:18:59 +00:00
Xavier Ducrohet
e2172b71fc Remove non-ready support libs. DO NOT MERGE. 
Change-Id: I319e9cb26e5ebfaafb3aa209732914f90ddf1446
 2014-06-10 17:27:26 -07:00
Deepanshu Gupta
4100ca144d Package renamed fonts again. 
PS names of fonts are renamed to include the version number. This change
packages the fonts from the output directory of the script that modifies
the fonts.

Change-Id: I023fb0dfcf50698f80e26b7d476969c453fc4cc7
 2014-06-10 18:42:40 -07:00
Raphael Moll
14023aeef1 Fix SDK repo to prevent mixing different targets. 
This makes sure that sdk-repo-*.zip doesn't exist to
avoid merging into an existing one.

Also fix a warning when generating the repo.xml files.

(cherry picked from commit 4df9f469f7)

Change-Id: Ifeb1234cacf121458bda9d869d7e5df5b5a19673
 2014-06-14 22:40:51 -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