Trevor Johns
85e87c555a
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 12:51:10 +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
950879ac33
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 00:07:45 +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
3fa7b69db6
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:27:25 +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
e1a3f47e5e
am 2c34d62a: Update LayoutLib API level to 12.
...
* commit '2c34d62a0c53c45f10bb834fb9e0b910c63b7fd4':
Update LayoutLib API level to 12.
2014-10-06 23:50:21 +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
de39486640
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:22:59 +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
a22d6f7077
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:41:31 +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
cb002a83be
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 19:41:37 +00:00
Xavier Ducrohet
3c0cd8cf15
Merge "Package libc++.so in the build-tools." into lmp-dev
2014-10-03 19:37:24 +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
f431341c3f
am e5aa0f3f: runtest: Remove unused CtsTestStubs dependency.
...
* commit 'e5aa0f3fa86c93789f8e03b3601998e3fc7eab8e':
runtest: Remove unused CtsTestStubs dependency.
2014-10-02 21:15:02 +00:00
Ruben Brunk
e5aa0f3fa8
runtest: Remove unused CtsTestStubs dependency.
...
Change-Id: Icee3004731ab5d37e8eb2caba76b19b0a5f1b1b7
2014-10-02 13:08:24 -07:00
Yigit Boyar
5ea5cc3d8e
am 52af2550: Don\'t layout removed scrap views
...
* commit '52af255018b0c56c4a35dfedf10720e7d4792bbc':
Don't layout removed scrap views
2014-10-02 17:56:23 +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
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
Stephen Hines
513c112f91
resolved conflicts for merge of 3f2caae2 to lmp-dev-plus-aosp
...
Change-Id: I540734e15e984d12b81cc47d90430e40cc3d2397
2014-10-01 16:12:34 -07:00
Andrew Hsieh
4981bc7318
am 4217c22d: am bb148d92: Merge "Refresh android-L headers (WW40)"
...
* commit '4217c22daab53ca8867a1eaa26a0aaa69dc33f54':
Refresh android-L headers (WW40)
2014-10-01 03:08:53 +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
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
Dake Gu
671225a12a
am 221b154a: SupportLeanbackDemo: Fix crash of launch Detail from Search
...
* commit '221b154a72d436f4c5de22fbdfbc19edc18b4f75':
SupportLeanbackDemo: Fix crash of launch Detail from Search
2014-09-29 20:49:22 +00:00
Andrew Hsieh
3dc6452076
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:42:01 +00:00
Andrew Hsieh
a428c4d6f2
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:41:46 +00:00
Andrew Hsieh
7d27bb7796
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:41:42 +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
Andrew Hsieh
ec2d5674a8
Merge "Bump up clang vesion accepting __builtin_isnan __attribute__((pcs("aapcs")))"
2014-09-29 01:20:12 +00:00
Andrew Hsieh
154cb25408
Merge "Add posix_memalign to libc.so for API 17,18,19"
2014-09-29 01:20:03 +00:00
Andrew Hsieh
c316a240c5
Merge "Added sys/ucontext.h and sys/user.h to all API levels."
2014-09-29 01:18:07 +00:00
Dake Gu
221b154a72
SupportLeanbackDemo: Fix crash of launch Detail from Search
...
Now DetailsFragment is expecting PhotoItem, SearchFragment should not pass
a String to DetailsFragment.
Change-Id: I7794c6a14dcaa1de1d1177f3288bb7460a45bf7d
2014-09-27 01:32:10 +00:00
Andrew Hsieh
70319d4de1
Add posix_memalign to libc.so for API 17,18,19
...
note that arch-x86 has it in 797351fd3b
Change-Id: I34c5d0b6887bdc7bd3411a837f90e6788bdf7ff4
2014-09-26 16:28:36 +08:00
Andrew Hsieh
3dbef8fe11
Bump up clang vesion accepting __builtin_isnan __attribute__((pcs("aapcs")))
...
Upstream clang3.6 still doesn't allow change of calling convension of
__builtin_isnan from the default to "softfp" (via __attribute__((pcs("aapcs"))))
as required by bionic libm.so for 32-bit ARM. Let's hope clang3.7
fix that. See upstream bug http://llvm.org/bugs/show_bug.cgi?id=20958
Change-Id: Ibdcc1783ffa7cf2f36e733983bd6d912ad38df70
2014-09-26 16:20:56 +08:00
Dan Albert
48a1ff8685
am 9bc92deb: am 20d16a75: Merge "Silence lcov existence test output."
...
* commit '9bc92deb11d67f4288595c1ca64e28f66ce27cc9':
Silence lcov existence test output.
2014-09-25 20:15:07 +00:00
Dan Albert
9bc92deb11
am 20d16a75: Merge "Silence lcov existence test output."
...
* commit '20d16a75b2e14fe8408e664cad0faae07f200f47':
Silence lcov existence test output.
2014-09-25 20:03:43 +00:00
Dan Albert
20d16a75b2
Merge "Silence lcov existence test output."
2014-09-25 19:57:18 +00:00
Dan Albert
7d133d23f9
Silence lcov existence test output.
...
Change-Id: I72ea929c8358d82c5653d7b475a35ddcb918dac0
2014-09-25 11:23:30 -07:00
Xavier Ducrohet
8439bda6b0
am 91909fae: Prepare the SDK component version numbers.
...
* commit '91909fae54217a8f9c17e7c1fecef1523e192bd9':
Prepare the SDK component version numbers.
2014-09-23 16:55:06 +00:00
Xavier Ducrohet
91909fae54
Prepare the SDK component version numbers.
...
Change-Id: I2577ec690533e6b45a95b38c6cc0f82cb0981c5b
2014-09-22 18:55:19 -07:00
Dan Albert
f9026b3669
am cbe2394e: am 217d230a: Merge "Add acov for coverage gathering/reporting."
...
* commit 'cbe2394ef0c8717cdfc13f6134ec7e957326d5b9':
Add acov for coverage gathering/reporting.
2014-09-22 16:40:02 +00:00
Dan Albert
cbe2394ef0
am 217d230a: Merge "Add acov for coverage gathering/reporting."
...
* commit '217d230af8f29583c5be96b0870fe8e187033bc2':
Add acov for coverage gathering/reporting.
2014-09-22 16:28:17 +00:00