Xavier Ducrohet
2567045c07
Merge "Remove SDK tools from build."
2014-05-09 00:46:53 +00:00
Xavier Ducrohet
396025ca7f
am f4554e79: am 40ad715f: am 7fc13d7a: am 1cad9512: Merge "Fix repo script to ignore tools"
...
* commit 'f4554e79e0fa2a5b09e636fe5b1765c318d79ce5':
Fix repo script to ignore tools
2014-05-08 21:51:27 +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
1cad951295
Merge "Fix repo script to ignore tools"
2014-05-08 19:28:09 +00:00
Xavier Ducrohet
d81eb5d833
Fix repo script to ignore tools
...
Change-Id: I80e6d5802f9a4633378d432eff3e91c2fcf83eeb
2014-05-08 12:26:20 -07:00
Andrew Hsieh
39e47ae801
am 08f9413c: am 96dc8d39: am b05c061e: am 4bc52758: Merge "Update epoll.h from bionic"
...
* commit '08f9413ce2b463b98ee30e079d4200f05f48cc11':
Update epoll.h from bionic
2014-05-08 18:36:48 +00:00
Andrew Hsieh
08f9413ce2
am 96dc8d39: am b05c061e: am 4bc52758: Merge "Update epoll.h from bionic"
...
* commit '96dc8d3956ada4cef55797049e8c91dc5eb42c0d':
Update epoll.h from bionic
2014-05-08 18:31:23 +00:00
The Android Automerger
c52069b3f6
merge in master-release history after reset to e4e9dc65f1
2014-05-08 05:49:29 -07:00
Pavel Chupin
4120ceca07
Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN
...
Update signal.c for build with old platforms
Change-Id: Ica87465a73004c0885d51e384acd4f42947cc19b
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2014-05-08 15:34:45 +04:00
Andrew Hsieh
96dc8d3956
am b05c061e: am 4bc52758: Merge "Update epoll.h from bionic"
...
* commit 'b05c061e501ef35b6b988e5f1f99ecb670d01bbe':
Update epoll.h from bionic
2014-05-08 00:45:00 +00:00
Andrew Hsieh
b05c061e50
am 4bc52758: Merge "Update epoll.h from bionic"
...
* commit '4bc5275825af47e11479b2cbff01193e90ca2ff4':
Update epoll.h from bionic
2014-05-08 00:42:39 +00:00
Andrew Hsieh
4bc5275825
Merge "Update epoll.h from bionic"
2014-05-08 00:40:20 +00:00
Jaekyun Seok
a71ffecaba
am e4e9dc65: Return result code properly
...
* commit 'e4e9dc65f1cc9d1984ea356951de283b0866bdc4':
Return result code properly
2014-05-08 00:27:54 +00:00
The Android Automerger
088e1f5c92
merge in master-release history after reset to 85283c70fa
2014-05-07 09:10:23 -07:00
Pavel Chupin
9973b9197f
Update epoll.h from bionic
...
Change-Id: I0c1c8180bcfab5022d5dcdcb5c768a17b9d77f16
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2014-05-07 19:06:03 +04:00
The Android Automerger
fd094800a1
merge in master-release history after reset to e9001a4d53
2014-05-07 05:49:30 -07:00
Jaekyun Seok
e4e9dc65f1
Return result code properly
...
Bug: 13444380
Change-Id: Ica2231115032e88cd967316768e0e9c71a359336
2014-05-07 16:05:37 +09:00
Tim Kilbourn
cae56b0cce
am 85283c70: am 62843523: (-s ours) am d91fd1cb: DO NOT MERGE Remove banner from manifest.
...
* commit '85283c70faf7ed040e12655dd166fc013baa20fd':
DO NOT MERGE Remove banner from manifest.
2014-05-06 21:44:50 +00:00
Tim Kilbourn
85283c70fa
am 62843523: (-s ours) am d91fd1cb: DO NOT MERGE Remove banner from manifest.
...
* commit '62843523e650d83e17d6bac7a62d229888568ad8':
DO NOT MERGE Remove banner from manifest.
2014-05-06 21:30:47 +00:00
Tim Kilbourn
62843523e6
am d91fd1cb: DO NOT MERGE Remove banner from manifest.
...
* commit 'd91fd1cb4be7f2c0672ffd9dbd38b304e44c0cc0':
DO NOT MERGE Remove banner from manifest.
2014-05-06 21:24:03 +00:00
Tim Kilbourn
d91fd1cb4b
DO NOT MERGE Remove banner from manifest.
...
The api is hidden in klp-modular-dev.
Change-Id: I78a569c7d876e0716eba9163490331dc5d81f87e
2014-05-06 14:16:35 -07:00
The Android Automerger
c4e98ecb60
merge in master-release history after reset to e9001a4d53
2014-05-06 05:49:30 -07:00
Raphael Moll
ee5154282a
am e9001a4d: am 891910a3: (-s ours) am bde50dcb: (-s ours) am 21980124: (-s ours) Merge "Revert "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE.""
...
* commit 'e9001a4d533cba6ee45063c8d83738694a5013ec':
Revert "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE."
2014-05-05 23:03:37 +00:00
Raphael Moll
e9001a4d53
am 891910a3: (-s ours) am bde50dcb: (-s ours) am 21980124: (-s ours) Merge "Revert "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE.""
...
* commit '891910a34c4eeac866715c78cf0e9b8f9b89767f':
Revert "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE."
2014-05-05 22:58:55 +00:00
Raphael Moll
891910a34c
am bde50dcb: (-s ours) am 21980124: (-s ours) Merge "Revert "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE.""
...
* commit 'bde50dcb0c7cd8a7a88be95ed2c5612872099f1e':
Revert "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE."
2014-05-05 22:54:58 +00:00
Raphael Moll
bde50dcb0c
am 21980124: (-s ours) Merge "Revert "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE.""
...
* commit '21980124f6aeb923cea50895eab8d6b9c31aba4a':
Revert "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE."
2014-05-05 22:52:16 +00:00
Raphael Moll
21980124f6
Merge "Revert "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE.""
2014-05-05 22:46:37 +00: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
The Android Automerger
2c09cac560
merge in master-release history after reset to 11e9c9a0e5
2014-05-05 05:49:27 -07:00
The Android Automerger
7cd107e72b
merge in master-release history after reset to 11e9c9a0e5
2014-05-04 05:49:21 -07:00
Raphael Moll
709f6d6193
am 11e9c9a0: am 6a059dea: (-s ours) am b38feb4f: (-s ours) am 4a5687a7: (-s ours) Merge "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE."
...
* commit '11e9c9a0e59824f387fbc94f900b0cc051d5fa17':
win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE.
2014-05-03 19:21:32 +00:00
Raphael Moll
11e9c9a0e5
am 6a059dea: (-s ours) am b38feb4f: (-s ours) am 4a5687a7: (-s ours) Merge "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE."
...
* commit '6a059deadb688deb20259071b2c894d77191ce5c':
win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE.
2014-05-03 19:18:01 +00:00
Raphael Moll
6a059deadb
am b38feb4f: (-s ours) am 4a5687a7: (-s ours) Merge "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE."
...
* commit 'b38feb4fc70cd7273b133046db4e8ba84c112800':
win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE.
2014-05-03 19:14:52 +00:00
Raphael Moll
b38feb4fc7
am 4a5687a7: (-s ours) Merge "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE."
...
* commit '4a5687a7144a60826b6fc035459fd691705b72bc':
win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE.
2014-05-03 19:12:05 +00:00
Raphael Moll
4a5687a714
Merge "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE."
2014-05-03 19:08:57 +00: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
The Android Automerger
fe385ef91c
merge in master-release history after reset to df3914b04c
2014-05-03 05:49:46 -07:00
Raphael Moll
16c367e67b
am df3914b0: am 257a315e: am 304c8070: am a783fe5f: Merge "Temporarily disable rs/bcc in win_sdk"
...
* commit 'df3914b04c07300558751aba9e7a05474474739a':
Temporarily disable rs/bcc in win_sdk
2014-05-03 00:16:02 +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
a783fe5f2c
Merge "Temporarily disable rs/bcc in win_sdk"
2014-05-03 00:02:13 +00:00
Yigit Boyar
cb23d84ffc
am 4718dfa4: am 864b97ae: am 6001125a: Merge "Updated recycler view demo with smooth scrolling" into klp-modular-dev
...
* commit '4718dfa473d9ee9259716c400ee79961c230eb15':
Updated recycler view demo with smooth scrolling
2014-05-02 22:26:20 +00:00
Deepanshu Gupta
a0306b1962
am adc0e01e: am 5bdd63dd: (-s ours) am c86e4941: am 11ea1bd2: am 99d404c4: am 9761e9c2: (-s ours) am 1f492924: am 40cab515: am 5a65a7ab: (-s ours) am 2613ee50: am 19e61e5f: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit 'adc0e01e6b184cdf0d7b358d8c6d9b9dd078ea07':
2014-05-02 22:26:18 +00:00
Deepanshu Gupta
e05e21f8a0
am b74ba373: am e08df140: (-s ours) am 81ccba52: am 059aa956: am 11ca5f1e: am 5f00e195: (-s ours) am 48ed332b: am b866a591: am b73c7b12: (-s ours) am c0e290d3: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit 'b74ba373a0c406e2275c04bea992618485301814':
Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 22:26:17 +00:00
Yigit Boyar
4718dfa473
am 864b97ae: am 6001125a: Merge "Updated recycler view demo with smooth scrolling" into klp-modular-dev
...
* commit '864b97ae3acf87af51bc9048fc120fbfbc33dfdb':
Updated recycler view demo with smooth scrolling
2014-05-02 22:18:04 +00:00
Deepanshu Gupta
adc0e01e6b
am 5bdd63dd: (-s ours) am c86e4941: am 11ea1bd2: am 99d404c4: am 9761e9c2: (-s ours) am 1f492924: am 40cab515: am 5a65a7ab: (-s ours) am 2613ee50: am 19e61e5f: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit '5bdd63ddf92b610f5133ac67d1bd40b731cd6502':
2014-05-02 22:15:19 +00:00