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
59045338b3
am d36c4dd6: am 21af667f: am 3c0cd8cf: Merge "Package libc++.so in the build-tools." into lmp-dev
...
* commit 'd36c4dd6464e1bd8e7fb26d2fc638f63030bcaea':
Package libc++.so in the build-tools.
2014-10-03 21:55:04 +00: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
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
Chris Banes
34e7d34d43
am 711b2dc8: am cb838606: Merge "Update Support7Demos for L appcompat" into lmp-mr1-dev
...
* commit '711b2dc8c1ba0f583834fee8bbc9edd0885fe4aa':
Update Support7Demos for L appcompat
2014-10-03 09:30:29 +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
479e77fdb8
am 4983e18f: am e5aa0f3f: runtest: Remove unused CtsTestStubs dependency.
...
* commit '4983e18f6cc22706ee14503247cecf7f7dc26112':
runtest: Remove unused CtsTestStubs dependency.
2014-10-02 21:45:53 +00: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
Yigit Boyar
af76982b9b
am 0cc925e5: am 52af2550: Don\'t layout removed scrap views
...
* commit '0cc925e5dc9b80f1950e4a089133196e105056ee':
Don't layout removed scrap views
2014-10-02 21:34:54 +00: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
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
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
Neil Fuller
dd4697d316
Remove dependencies on FloatMath
...
See frameworks/base commit 33253a4baa6279f81a73425b49dfb6abe5f5416e
for details.
Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I01126788f34b9a464b873bc2fff03acedc43bb52
2014-10-02 15:19:08 +01:00
Narayan Kamath
c9c9d4f4cf
am d515d6c5: resolved conflicts for merge of 3f2caae2 to lmp-mr1-dev-plus-aosp
...
* commit 'd515d6c5c4979d5b4856f926187b834cf6b3cd35':
2014-10-02 13:40:02 +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
Narayan Kamath
3a8e6ab6e2
resolved conflicts for merge of 3f2caae2 to lmp-mr1-dev-plus-aosp
...
Change-Id: If5c6c20d7c213eba50e022adfbe5c21be3b26a76
2014-10-02 14:32:00 +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
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
3467bbd9a5
am 991459db: am 4217c22d: am bb148d92: Merge "Refresh android-L headers (WW40)"
...
* commit '991459db7adec0626bfa2d5106f9cc548e007292':
Refresh android-L headers (WW40)
2014-10-01 03:18:55 +00: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
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
Dake Gu
64ec030e05
SupportLeanbackDemo: show case of different image scale type
...
b/17703309
Change-Id: Iaf3b5e519e09c7e2a728fe048f8a63e3b9b16cfe
2014-09-30 15:55:32 -07:00
Dake Gu
81ed058a69
am 6768d21f: am 221b154a: SupportLeanbackDemo: Fix crash of launch Detail from Search
...
* commit '6768d21fafd9d1ad445f3f549bf9076daf115564':
SupportLeanbackDemo: Fix crash of launch Detail from Search
2014-09-30 21:14:16 +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
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
1235b737f3
am 027f2aff: am 1978baa1: am ec2d5674: Merge "Bump up clang vesion accepting __builtin_isnan __attribute__((pcs("aapcs")))"
...
* commit '027f2afff421aebfa7efd68ce993bac1ea0f7c96':
Bump up clang vesion accepting __builtin_isnan __attribute__((pcs("aapcs")))
2014-09-29 20:47:41 +00:00
Andrew Hsieh
eea56f962d
am 1a9fba3c: am f5ad59d4: am 154cb254: Merge "Add posix_memalign to libc.so for API 17,18,19"
...
* commit '1a9fba3cd2705a9732786640148d5218a9bb9e21':
Add posix_memalign to libc.so for API 17,18,19
2014-09-29 20:47:40 +00:00
Andrew Hsieh
4c7dd14e77
am d3df9917: am 132945b9: am c316a240: Merge "Added sys/ucontext.h and sys/user.h to all API levels."
...
* commit 'd3df99171a0e3dc752dc63eaad79749255323aa4':
Added sys/ucontext.h and sys/user.h to all API levels.
2014-09-29 20:47:39 +00: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
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