Commit Graph

15550 Commits

Author SHA1 Message Date
Andrew Hsieh
dcebc2f1d8 am 93dd2f8a: am b02b4bce: Merge "Add missing function prototypes in time.h"
* commit '93dd2f8a29c6b30a902db4136eec465c704fe380':
  Add missing function prototypes in time.h
2014-10-15 03:02:17 +00:00
Andrew Hsieh
93dd2f8a29 am b02b4bce: Merge "Add missing function prototypes in time.h"
* commit 'b02b4bced417d38f547f874b4f425270decc2e61':
  Add missing function prototypes in time.h
2014-10-15 02:59:13 +00:00
Andrew Hsieh
b02b4bced4 Merge "Add missing function prototypes in time.h" 2014-10-15 02:44:06 +00:00
Haruki Hasegawa
13af1d8c37 Add missing function prototypes in time.h
Add clock_settime() and clock_nanosleep() function
prototypes in time.h.

Change-Id: I0eb45e465b3b48b9d4f3a4a8109a6f2d9c4f8ce2
Signed-off-by: Haruki Hasegawa <h6a.h4i.0@gmail.com>
2014-10-15 10:42:24 +08:00
Trevor Johns
030c809752 am 913f8146: am 569e9feb: am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev
* commit '913f814641732ac243f823431d3dfeac2a6e646f':
  Update sdk_repo samples 20 from 1 to 2
2014-10-10 17:00:22 +00:00
Trevor Johns
913f814641 am 569e9feb: am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev
* commit '569e9febc5c91d92459579e32df7b948d3e32dff':
  Update sdk_repo samples 20 from 1 to 2
2014-10-09 19:23:24 +00:00
Trevor Johns
569e9febc5 am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev
* commit '679920d8091c0fb10e68667f158b9e18a77689fa':
  Update sdk_repo samples 20 from 1 to 2
2014-10-09 01:24:03 +00:00
Trevor Johns
679920d809 Merge commit '3992ec56' into klp-modular-dev
Merged with '-s ours', since the DO NOT MERGE directive from
3992ec56 wasn't properly recognized.

Change-Id: If5abab964ab49a6ce02e8da1ff67d2ee12d1b7de
2014-10-08 17:41:47 -07:00
Chenjie Luo
d47b5cee82 am 9ac2afe4: am 88fbf1fe: Update test runner for cts tests in testrunner/test_defs.xml
* commit '9ac2afe4cef95ed49903ac64b3d57b80aa055c3c':
  Update test runner for cts tests in testrunner/test_defs.xml
2014-10-08 07:52:08 +00:00
Chenjie Luo
9ac2afe4ce am 88fbf1fe: Update test runner for cts tests in testrunner/test_defs.xml
* commit '88fbf1fe733a5332f1a2ba44253b46a20fed1e6f':
  Update test runner for cts tests in testrunner/test_defs.xml
2014-10-08 05:24:56 +00:00
Chenjie Luo
88fbf1fe73 Update test runner for cts tests in testrunner/test_defs.xml
Bug: 17885115

Change-Id: I2f95d9964bf152fb1b609e0c878eea1cb096f76f
2014-10-07 15:39:55 -07:00
Tor Norbye
1181e94193 am 3f75a9a0: am 3b2fe7eb: Merge "Bug 17782530: Annotations using retention policy source remain in .class" into lmp-dev
* commit '3f75a9a0341599c228592895fe49527964b52dbf':
  Bug 17782530: Annotations using retention policy source remain in .class
2014-10-07 01:32:32 +00:00
Tor Norbye
3f75a9a034 am 3b2fe7eb: Merge "Bug 17782530: Annotations using retention policy source remain in .class" into lmp-dev
* commit '3b2fe7eb9cab88d3957794cb0f14ddc10a57dc29':
  Bug 17782530: Annotations using retention policy source remain in .class
2014-10-07 01:22:17 +00:00
Tor Norbye
3b2fe7eb9c Merge "Bug 17782530: Annotations using retention policy source remain in .class" into lmp-dev 2014-10-07 01:07:25 +00:00
Deepanshu Gupta
9fabccbf9b am e5a9f9d0: am 2c34d62a: Update LayoutLib API level to 12.
* commit 'e5a9f9d066a7464a9d25d679c101c60fee03459a':
  Update LayoutLib API level to 12.
2014-10-07 00:55:37 +00:00
Deepanshu Gupta
e5a9f9d066 am 2c34d62a: Update LayoutLib API level to 12.
* commit '2c34d62a0c53c45f10bb834fb9e0b910c63b7fd4':
  Update LayoutLib API level to 12.
2014-10-07 00:20:33 +00:00
Deepanshu Gupta
2c34d62a0c Update LayoutLib API level to 12.
Change-Id: I7e392515939728251424d44d5957f95bdf3eb741
2014-10-06 16:39:12 -07:00
Tor Norbye
b6b7487e23 Bug 17782530: Annotations using retention policy source remain in .class
Change-Id: I763e99c243d85406162e3b898fe1e5af8c216173
2014-10-06 16:21:36 -07:00
Christopher Ferris
8aa117a3b0 am 9329e4f0: am bb0d2060: Merge "Do not call art-on macro by default." into lmp-dev
* commit '9329e4f0ad20a44cad77ba5cf128fb9b6f25beef':
  Do not call art-on macro by default.
2014-10-05 19:35:19 +00:00
Christopher Ferris
9329e4f0ad am bb0d2060: Merge "Do not call art-on macro by default." into lmp-dev
* commit 'bb0d2060884d131bdb0321c06ff49b04ba2196b4':
  Do not call art-on macro by default.
2014-10-05 19:27:09 +00:00
Christopher Ferris
bb0d206088 Merge "Do not call art-on macro by default." into lmp-dev 2014-10-05 19:20:06 +00:00
Tor Norbye
de4255ab85 am 7fb913fe: am 0eac39db: 17782530: Annotations using retention policy source remain in .class
* commit '7fb913fe2c83e04ebf487597477947416ff805dc':
  17782530: Annotations using retention policy source remain in .class
2014-10-04 21:02:15 +00:00
Tor Norbye
7fb913fe2c am 0eac39db: 17782530: Annotations using retention policy source remain in .class
* commit '0eac39db9053bd3f417d113553d81e36acbbffcc':
  17782530: Annotations using retention policy source remain in .class
2014-10-04 20:45:18 +00:00
Tor Norbye
0eac39db90 17782530: Annotations using retention policy source remain in .class
Change-Id: Ia62e0d6ef5024515567be6564197e723f0013ee0
2014-10-04 18:49:35 +00:00
Christopher Ferris
436b740b70 Do not call art-on macro by default.
If you are debugging a native process, SIGSEGV gets ignored by default.
The gdbclient bash function has been modified to only call the art-on
macro when running gdbclient app_processXX.

Also, print a warning in case someone is trying to debug a native
process using app_process.

Bug: 17815162
Change-Id: I0666e6713b0a03ee713be7827c5b671938f2c263
2014-10-03 17:31:41 -07:00
Xavier Ducrohet
d36c4dd646 am 21af667f: am 3c0cd8cf: Merge "Package libc++.so in the build-tools." into lmp-dev
* commit '21af667faeba1e626e79eb823ea604652dc17cf2':
  Package libc++.so in the build-tools.
2014-10-03 21:47:46 +00:00
Xavier Ducrohet
21af667fae am 3c0cd8cf: Merge "Package libc++.so in the build-tools." into lmp-dev
* commit '3c0cd8cf154320a375f971ba1ce3be4497130837':
  Package libc++.so in the build-tools.
2014-10-03 21:32:35 +00:00
Xavier Ducrohet
3c0cd8cf15 Merge "Package libc++.so in the build-tools." into lmp-dev 2014-10-03 19:37:24 +00:00
Chris Banes
711b2dc8c1 am cb838606: Merge "Update Support7Demos for L appcompat" into lmp-mr1-dev
* commit 'cb838606af158fbbe510e14571e84b8cb099c592':
  Update Support7Demos for L appcompat
2014-10-03 09:25:35 +00:00
Chris Banes
cb838606af Merge "Update Support7Demos for L appcompat" into lmp-mr1-dev 2014-10-03 08:37:00 +00:00
Trevor Johns
3992ec5675 Update sdk_repo samples 20 from 1 to 2
DO NOT MERGE

Change-Id: Ia9d89a28991fc1ac4d81e18fe596bc793e54353c
2014-10-02 18:36:43 -07:00
Ruben Brunk
4983e18f6c am e5aa0f3f: runtest: Remove unused CtsTestStubs dependency.
* commit 'e5aa0f3fa86c93789f8e03b3601998e3fc7eab8e':
  runtest: Remove unused CtsTestStubs dependency.
2014-10-02 21:41:29 +00:00
Ruben Brunk
e5aa0f3fa8 runtest: Remove unused CtsTestStubs dependency.
Change-Id: Icee3004731ab5d37e8eb2caba76b19b0a5f1b1b7
2014-10-02 13:08:24 -07:00
Yigit Boyar
0cc925e5dc am 52af2550: Don\'t layout removed scrap views
* commit '52af255018b0c56c4a35dfedf10720e7d4792bbc':
  Don't layout removed scrap views
2014-10-02 19:44:06 +00:00
Yigit Boyar
52af255018 Don't layout removed scrap views
This CL also changes the addView logic in demo LM. Previously, removed
views were not added. Now, RV takes care of this so LM can simply add them.

Bug: 17783492
Change-Id: I375405ef888fd43f9da0e1a1c13ae54bae381b44
2014-10-02 17:43:03 +00:00
Narayan Kamath
d515d6c5c4 resolved conflicts for merge of 3f2caae2 to lmp-mr1-dev-plus-aosp
Change-Id: If9f3110e57131f13c55a87169dbdc2cd8cf74660
2014-10-02 14:35:25 +01:00
Chris Banes
cbeaa03cb8 Update Support7Demos for L appcompat
New Toolbar samples along with some improvements
for the other Action Bar activities.

Change-Id: I28dca1bd86ea4c269b711f4d10283e71384a33ac
2014-10-02 10:08:24 +01:00
Xavier Ducrohet
25feba6980 Package libc++.so in the build-tools.
This is needed by llvm-rs-cc.

Bug: 17584627
Change-Id: Id0ee90ccead26d3078f3f25022391d6866152203
2014-10-01 22:12:58 -07:00
Andrew Hsieh
991459db7a am 4217c22d: am bb148d92: Merge "Refresh android-L headers (WW40)"
* commit '4217c22daab53ca8867a1eaa26a0aaa69dc33f54':
  Refresh android-L headers (WW40)
2014-10-01 03:12:19 +00:00
Andrew Hsieh
4217c22daa am bb148d92: Merge "Refresh android-L headers (WW40)"
* commit 'bb148d92dbde9c0fb47d6e06be38a155bd59f9f0':
  Refresh android-L headers (WW40)
2014-10-01 03:00:21 +00:00
Andrew Hsieh
bb148d92db Merge "Refresh android-L headers (WW40)" 2014-10-01 02:54:10 +00:00
Dake Gu
6768d21faf am 221b154a: SupportLeanbackDemo: Fix crash of launch Detail from Search
* commit '221b154a72d436f4c5de22fbdfbc19edc18b4f75':
  SupportLeanbackDemo: Fix crash of launch Detail from Search
2014-09-30 21:10:00 +00:00
Stephen Hines
3f2caae206 Restore the ability to build RS-related binaries on Windows.
Bug: 14416410

This change reverts two prior commits (listed below):

Revert "Use renderscript prebuilts for windows."
This reverts commit ebacf02e88.

Revert "Temporarily disable rs/bcc in win_sdk"
This reverts commit c63c2d31ba.
2014-09-30 02:35:08 -07:00
Andrew Hsieh
a045a37c35 Refresh android-L headers (WW40)
linux/input.h: e2d86feb7b6b0b02b5e826c5f8836a6e104e9b71
stdlib.h and wchar.h: 3c5037f1b3b747e79d17a5f717d9f9c365132d33
sys/ucontext.h: 8e4d371091e5738346f5c6ad395b8487c2a5ec67

Change-Id: I80ced5cf212ff7c19628be10ba871ce1e6222d51
2014-09-30 09:24:03 +08:00
Andrew Hsieh
027f2afff4 am 1978baa1: am ec2d5674: Merge "Bump up clang vesion accepting __builtin_isnan __attribute__((pcs("aapcs")))"
* commit '1978baa1ae7b0a4b74030608cfc4fe71a64ffb55':
  Bump up clang vesion accepting __builtin_isnan __attribute__((pcs("aapcs")))
2014-09-29 05:44:03 +00:00
Andrew Hsieh
1a9fba3cd2 am f5ad59d4: am 154cb254: Merge "Add posix_memalign to libc.so for API 17,18,19"
* commit 'f5ad59d43f282c47e0c4a694da15cb9e80071d82':
  Add posix_memalign to libc.so for API 17,18,19
2014-09-29 05:43:52 +00:00
Andrew Hsieh
d3df99171a am 132945b9: am c316a240: Merge "Added sys/ucontext.h and sys/user.h to all API levels."
* commit '132945b90c83c8296bc5036ea1de753b804050ab':
  Added sys/ucontext.h and sys/user.h to all API levels.
2014-09-29 05:43:47 +00:00
Andrew Hsieh
1978baa1ae am ec2d5674: Merge "Bump up clang vesion accepting __builtin_isnan __attribute__((pcs("aapcs")))"
* commit 'ec2d5674a8d6361eb748125b7e83120870ec5289':
  Bump up clang vesion accepting __builtin_isnan __attribute__((pcs("aapcs")))
2014-09-29 01:25:52 +00:00
Andrew Hsieh
f5ad59d43f am 154cb254: Merge "Add posix_memalign to libc.so for API 17,18,19"
* commit '154cb254080b5f5ae1869464d822a9928cf08351':
  Add posix_memalign to libc.so for API 17,18,19
2014-09-29 01:20:50 +00:00
Andrew Hsieh
132945b90c am c316a240: Merge "Added sys/ucontext.h and sys/user.h to all API levels."
* commit 'c316a240c548ebbe98cbc25bcf895f87a8536cf3':
  Added sys/ucontext.h and sys/user.h to all API levels.
2014-09-29 01:20:48 +00:00