LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,667 Commits 2 Branches 0 Tags
fe134ceca3fb91044fda8157883ddfe2ad8cc9a1
Commit Graph

642 Commits

Author SHA1 Message Date
Erik Pasternak
a4a83ccba1 am 0b7a8dbd: Merge "Revert "Package renamed fonts."" into lmp-preview-dev 
* commit '0b7a8dbde8b006aef349f75f4837b7f1c9e498fd':
  Revert "Package renamed fonts."
 2014-06-09 15:55:46 +00:00
Deepanshu Gupta
177e561e40 am cde7418e: Merge "Package renamed fonts." into lmp-preview-dev 
* commit 'cde7418ead103db609dbee8e43b2b91992f3a74a':
  Package renamed fonts.
 2014-06-09 15:55:27 +00:00
Erik Pasternak
cdee35f788 Revert "Package renamed fonts." 
This change broke the SDK builds.

This reverts commit ef43acc413.

Change-Id: I84af70750f72792cd2e509677c398faefa6e8d91
 2014-06-08 19:30:44 +00:00
Raphael Moll
df72a54f9c am adcf12ed: am 4000df93: am 6ab8ef21: Merge "Move SDK system-image source.prop_templates in their own folder." 
* commit 'adcf12ed0864d17937a358b18a609a611cfa8bf5':
  Move SDK system-image source.prop_templates in their own folder.
 2014-06-04 22:01:47 +00: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
4000df931b am 6ab8ef21: Merge "Move SDK system-image source.prop_templates in their own folder." 
* commit '6ab8ef21b8826b19e92a47f70d3ba30e04ba66cc':
  Move SDK system-image source.prop_templates in their own folder.
 2014-06-04 21:46:13 +00:00
Raphael Moll
6ab8ef21b8 Merge "Move SDK system-image source.prop_templates in their own folder." 2014-06-04 21:30:14 +00:00
Steve Moyer
23a8adf276 DO NOT MERGE: Add SmsTest and mege emulator smoke tests 
Picked Changes:
Add SMS test to verify emulator can receive sms from DDMS
Adding test tag to sms test
Add up to 6 10 second delays to wait for sms
Merging emulator smoke test projects
Combining SmsTest, GpsLocationTests, and ConnectivityTest

Conflicts:
	build/sdk.atree

Change-Id: I1343c59418a69b2f5e1eb0c6cde54f2bc09300ac
 2014-06-04 09:55:31 -07:00
Raphael Moll
32b5e338b5 am 95a5c56c: am 728f321c: Merge "Add Build-Tools runtime.properties file." 
* commit '95a5c56c8f6d87bb9a3c4d08b94c13c409c6ea74':
  Add Build-Tools runtime.properties file.
 2014-06-04 12:28:41 +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
5ea71acfdd am e9555599: am 087ccb01: Merge "Fix SDK repo to prevent mixing different targets." 
* commit 'e9555599da16c3e40d0d359f6e46fedfc1f03b1d':
  Fix SDK repo to prevent mixing different targets.
 2014-06-03 03:00:47 +00:00
Raphael Moll
e9555599da am 087ccb01: Merge "Fix SDK repo to prevent mixing different targets." 
* commit '087ccb01527d9d7e8981751639c65b1eb6369534':
  Fix SDK repo to prevent mixing different targets.
 2014-06-03 02:56:09 +00:00
Raphael Moll
087ccb0152 Merge "Fix SDK repo to prevent mixing different targets." 2014-06-03 01:27:03 +00:00
Raphael Moll
4df9f469f7 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.

Change-Id: I645ad13936b83c5c33bd84c046b60b77488b9113
 2014-06-02 17:11:45 -07:00
Deepanshu Gupta
ef43acc413 Package renamed fonts. 
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: Iac2a34475b095ed38f8706420acda40c5d53364b
 2014-05-30 10:38:45 -07:00
Chris Banes
8028b39252 Add android-support-v7-palette to build 
Change-Id: I22cec92b976645d766441b140a5d5754c4ebbe46
 2014-05-30 10:17:46 +00: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
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
Evan Charlton
10163e76fc am 311e3662: Merge "Merging emulator smoke test projects" into master-nova 
* commit '311e3662bdaec82c621fd3b04c4505ce60d2df15':
  Merging emulator smoke test projects
 2014-05-13 15:19:06 +00:00
Baligh Uddin
31078f7fbd am 3b842a86: keep history after reset to master-nova-dev 
* commit '3b842a8628da809286b810b6881e382890ead1f6':
 2014-05-13 15:18:49 +00:00
Andrew Hsieh
be9d36572c am 106c0c69: am 3d34e652: am 7b004d96: Merge "Add libcxx projects and compiler-rt to windows whitelist." 
* commit '106c0c694c9818fd45fee7afa0af33b25407fb25':
  Add libcxx projects and compiler-rt to windows whitelist.
 2014-05-12 10:34:52 +00:00
Andrew Hsieh
106c0c694c am 3d34e652: am 7b004d96: Merge "Add libcxx projects and compiler-rt to windows whitelist." 
* commit '3d34e6524e035c6f55cac6553c73c7b18f9910c3':
  Add libcxx projects and compiler-rt to windows whitelist.
 2014-05-12 10:30:32 +00:00
Andrew Hsieh
3d34e6524e am 7b004d96: Merge "Add libcxx projects and compiler-rt to windows whitelist." 
* commit '7b004d960657c15145ce1272f7a61c8ca4272cd1':
  Add libcxx projects and compiler-rt to windows whitelist.
 2014-05-12 10:27:46 +00:00
Stephen Hines
d7d603fbbb Add libcxx projects and compiler-rt to windows whitelist. 
Change-Id: I2d6189b4e9a0440330d1212dae9396b88b66ea3f
 2014-05-09 14:45:58 -07:00
Xavier Ducrohet
580b170364 am 6ee534bf: am 557639cf: am 2567045c: Merge "Remove SDK tools from build." 
* commit '6ee534bf5d492e61e03fa863ddfb2142131cad9f':
  Remove SDK tools from build.
 2014-05-09 00:59:58 +00:00
Xavier Ducrohet
6ee534bf5d am 557639cf: am 2567045c: Merge "Remove SDK tools from build." 
* commit '557639cf1167a32c9601a53fd70af7eb81413556':
  Remove SDK tools from build.
 2014-05-09 00:56:45 +00:00
Xavier Ducrohet
557639cf11 am 2567045c: Merge "Remove SDK tools from build." 
* commit '2567045c07dfae87fa53dfdc349681b5311d3522':
  Remove SDK tools from build.
 2014-05-09 00:52:33 +00:00
Xavier Ducrohet
ce00253c5b Remove SDK tools from build. 
(cherry picked from commit 1678734ef064893f28390fac16f4633d0fb7361a)

Change-Id: Ia689f66868de18341b863e19f2958434eb45ca59
 2014-05-08 14:49:09 -07:00
Xavier Ducrohet
f4554e79e0 am 40ad715f: am 7fc13d7a: am 1cad9512: Merge "Fix repo script to ignore tools" 
* commit '40ad715f74740451e888b336b302f9e8628f3964':
  Fix repo script to ignore tools
 2014-05-08 21:42:58 +00:00
Xavier Ducrohet
40ad715f74 am 7fc13d7a: am 1cad9512: Merge "Fix repo script to ignore tools" 
* commit '7fc13d7ad63eb0fad3d30b4b909baca6651ee303':
  Fix repo script to ignore tools
 2014-05-08 19:36:30 +00:00
Xavier Ducrohet
7fc13d7ad6 am 1cad9512: Merge "Fix repo script to ignore tools" 
* commit '1cad951295f4b7bbd6edd8c1c5c7a791f7078033':
  Fix repo script to ignore tools
 2014-05-08 19:32:31 +00:00
Xavier Ducrohet
d81eb5d833 Fix repo script to ignore tools 
Change-Id: I80e6d5802f9a4633378d432eff3e91c2fcf83eeb
 2014-05-08 12:26:20 -07:00
Raphael Moll
438cc639d0 Revert "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE." 
This reverts commit 4a747f67b0.
 2014-05-05 14:57:16 -07:00
Raphael Moll
4a747f67b0 win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE. 
This deactivate building all the exe binaries
and prevents atree from running (both for dev.git
and sdk.git). This still results in a win_sdk folder
so that the sdk_repo rule can work, but the generated
sdk will only contain linux binaries and is not to be
used for production, obviously.

Change-Id: I99cd27a050278afae3b62d1ef34a0a1a542bfd1a
 2014-05-03 19:07:57 +00:00
Raphael Moll
df3914b04c am 257a315e: am 304c8070: am a783fe5f: Merge "Temporarily disable rs/bcc in win_sdk" 
* commit '257a315e72d8b878b71f1735c8174cfe69cde8c7':
  Temporarily disable rs/bcc in win_sdk
 2014-05-03 00:11:22 +00:00
Raphael Moll
257a315e72 am 304c8070: am a783fe5f: Merge "Temporarily disable rs/bcc in win_sdk" 
* commit '304c80705867d34b3323350a2cf0412e2931f6d0':
  Temporarily disable rs/bcc in win_sdk
 2014-05-03 00:08:04 +00:00
Raphael Moll
304c807058 am a783fe5f: Merge "Temporarily disable rs/bcc in win_sdk" 
* commit 'a783fe5f2c4e053b92b51ea1725fb535eaae7b0b':
  Temporarily disable rs/bcc in win_sdk
 2014-05-03 00:04:52 +00:00
Raphael Moll
c63c2d31ba Temporarily disable rs/bcc in win_sdk 
Change-Id: Ic3c49f14098662c83167151a2abc7f46d847c67f
 2014-05-02 12:21:17 -07:00