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

612 Commits

Author SHA1 Message Date
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
Bill Yi
23f68632c7 Merge commit 'd297be2136209cab4edbcf8879520f65fb564103' into HEAD 2014-04-29 11:33:09 -07:00
Alexander Lucas
b9581d5aae am 229d4df3: am 5bf3d523: am fd5ede91: am f5d4c15b: Added swipe-to-refresh samples to sdk.atree 
* commit '229d4df318a4adc0fae28989b8cb0ca277a2f201':
  Added swipe-to-refresh samples to sdk.atree
 2014-04-11 23:01:16 +00:00
Alexander Lucas
5bf3d5236c am fd5ede91: am f5d4c15b: Added swipe-to-refresh samples to sdk.atree 
* commit 'fd5ede91e7900da3bbc20b9ef0ca3859ec499e01':
  Added swipe-to-refresh samples to sdk.atree
 2014-04-11 22:31:42 +00:00
Alexander Lucas
f5d4c15b0b Added swipe-to-refresh samples to sdk.atree 
Change-Id: If939f14e90c04d2df8bbe683812d2f01ef5f3399
 2014-04-11 15:20:55 -07:00
Alexander Lucas
b015fd0ff0 am b020e934: am ad5f0e86: am eb72a600: am 4a25165a: Merge "Updated Samples metadata for April push of samples" into klp-docs 
* commit 'b020e934c5584706d7edfa0c0fe24f69f6a6d38b':
  Updated Samples metadata for April push of samples
 2014-04-11 20:36:08 +00:00
Alexander Lucas
ad5f0e867b am eb72a600: am 4a25165a: Merge "Updated Samples metadata for April push of samples" into klp-docs 
* commit 'eb72a6002c8ebdeeb94e432dadc828d7d158cbf2':
  Updated Samples metadata for April push of samples
 2014-04-11 20:29:54 +00:00
Alexander Lucas
c7ad654960 Updated Samples metadata for April push of samples 
Change-Id: Ie4136c1cb9051bead3c73a93ccf646577d721a50
 2014-04-11 13:21:11 -07:00
Xavier Ducrohet
f3ff0296c9 Move ZipAlign to build-tools. DO NOT MERGE. 
(cherry picked from commit 76510e2dd2)

Change-Id: I2262795c0dfe9b103fda8c9a50a80d688ece5a12
 2014-04-04 10:45:35 -07:00
Steve Moyer
0b1a1f7b38 Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests" 2014-04-04 16:32:00 +00:00
Xavier Ducrohet
8821b239d1 am d6ccbcd2: am 47eadf1e: Merge "Move ZipAlign to build-tools." 
* commit 'd6ccbcd253d34feb75cba4cbd98f520dfa789757':
  Move ZipAlign to build-tools.
 2014-04-04 03:19:02 +00:00
Xavier Ducrohet
d6ccbcd253 am 47eadf1e: Merge "Move ZipAlign to build-tools." 
* commit '47eadf1ecef5e898d63863edaa644615942ad0fd':
  Move ZipAlign to build-tools.
 2014-04-04 00:08:23 +00:00
Steve Moyer
6ded79d696 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-04-03 16:02:56 -07:00
Xavier Ducrohet
76510e2dd2 Move ZipAlign to build-tools. 
Change-Id: Id83a8dc86946bcde78e9eaaab009a06a59fccbd0
 2014-04-03 10:09:53 -07:00
Xavier Ducrohet
6ee68fe343 am 6e211383: am 459fdbce: am dcb2c538: Add annotation support lib to SDK. 
* commit '6e21138341dde9036675737cdfa8baa76cb70c5d':
  Add annotation support lib to SDK.
 2014-03-26 18:23:16 +00:00
Xavier Ducrohet
459fdbcee8 am dcb2c538: Add annotation support lib to SDK. 
* commit 'dcb2c538b88b84ba33dd2dd3a4afaab79a05608a':
  Add annotation support lib to SDK.
 2014-03-26 18:10:47 +00:00
Xavier Ducrohet
dcb2c538b8 Add annotation support lib to SDK. 
Change-Id: If9faed19abc14fe6af288494c688a80789215a3b
 2014-03-26 10:49:13 -07:00
Tim Kilbourn
cdb09c943e am 56c1077d: am c9d6af6b: Merge "Add the stub src dir to the leanback extras." into klp-modular-dev 
* commit '56c1077d131cf807563eb7b8e8bc2263f8bb1748':
  Add the stub src dir to the leanback extras.
 2014-03-24 19:35:16 +00:00
Tim Kilbourn
61c46959b5 Add the stub src dir to the leanback extras. 
Change-Id: I614bcdd9f9061917fb2c4721cbe1752fd56f6c12
 2014-03-18 13:36:11 -07:00
Alexander Lucas
ab05cdfb72 am dd7dda23: am 964fa100: am 7ae2eca4: am 7a80e034: Merge "Added new samples to sdk.atree for march push" into klp-docs 
* commit 'dd7dda23a56844b706bd20c752b0696571fc582d':
  Added new samples to sdk.atree for march push
 2014-03-14 17:54:24 +00:00
Alexander Lucas
964fa100be am 7ae2eca4: am 7a80e034: Merge "Added new samples to sdk.atree for march push" into klp-docs 
* commit '7ae2eca4a0762f347e2a1981dc1becbc16a5c4bc':
  Added new samples to sdk.atree for march push
 2014-03-14 16:28:32 +00:00
Alexander Lucas
9e924b6820 am 7ae2eca4: am 7a80e034: Merge "Added new samples to sdk.atree for march push" into klp-docs 
* commit '7ae2eca4a0762f347e2a1981dc1becbc16a5c4bc':
  Added new samples to sdk.atree for march push
 2014-03-14 04:14:08 +00:00
Alexander Lucas
7ae2eca4a0 am 7a80e034: Merge "Added new samples to sdk.atree for march push" into klp-docs 
* commit '7a80e034839e02c295cb75c59c6af75e17dad238':
  Added new samples to sdk.atree for march push
 2014-03-13 22:15:02 +00:00
Tim Kilbourn
957fa659c2 resolved conflicts for merge of 9eecf3fc to master 
Change-Id: If38c80cd560d8b419420fc05a872c31b6031d90a
 2014-03-12 17:27:10 -07:00
Tim Kilbourn
349ba52587 Add new support libs into the sdk build. 
android-support-v7-recyclerview
android-support-v17-leanback

Change-Id: I6538bb30204aeaeac0b0ea34f0a5951e09f58866
 2014-03-12 15:28:23 -07:00
Alexander Lucas
c4a6ecf00d Added new samples to sdk.atree for march push 
Change-Id: Ic138c1ff32c86ebb48375cc07d0c138829c8a3f7
 2014-03-10 14:49:49 -07:00
Alexander Lucas
97c8590ca8 Updating build metadata for march sample push. 
Change-Id: Ic8f6e2adce61c76cfb3e3c6db96f13c915be7a63
 2014-03-07 15:00:38 -08:00
Steve Moyer
b99f97d38e Merging emulator smoke test projects 
Combining SmsTest, GpsLocationTests, and ConnectivityTest

Change-Id: I7a9b8e787af37704e6af43b93f169ef90980cb2d
 2014-03-03 15:28:02 -08:00
Steve Moyer
138d520cf7 Merging emulator smoke test projects 
Combining SmsTest, GpsLocationTests, and ConnectivityTest

Change-Id: I7a9b8e787af37704e6af43b93f169ef90980cb2d
 2014-02-20 10:26:59 -08:00
Steve Moyer
a775c5a05d Merge "Adding SmsTest to emulator" 2014-02-11 00:42:36 +00:00
Steve Moyer
5db4928a45 Adding SmsTest to emulator 
Change-Id: I0820ec25550debab3755db569e0e4fb6a9c62e94
 2014-02-10 17:59:29 +00:00