Elliott Hughes
7cefbb1c78
am 112bd5ad
: am 85967c7e
: am d46e3f1f
: am 3d3dd4a1
: Merge "Fix aarch64 and x86-64 AndroidConfig.h."
...
* commit '112bd5ad2e57c621abbb36035e1820d7844882b9':
Fix aarch64 and x86-64 AndroidConfig.h.
2013-12-18 23:42:20 +00:00
Elliott Hughes
112bd5ad2e
am 85967c7e
: am d46e3f1f
: am 3d3dd4a1
: Merge "Fix aarch64 and x86-64 AndroidConfig.h."
...
* commit '85967c7ef085b85cf54821e626e2634113fb2cbc':
Fix aarch64 and x86-64 AndroidConfig.h.
2013-12-18 23:40:25 +00:00
Elliott Hughes
85967c7ef0
am d46e3f1f
: am 3d3dd4a1
: Merge "Fix aarch64 and x86-64 AndroidConfig.h."
...
* commit 'd46e3f1fdfbd5511fc99fb44fbf272e28a823f8b':
Fix aarch64 and x86-64 AndroidConfig.h.
2013-12-18 23:38:27 +00:00
Elliott Hughes
d46e3f1fdf
am 3d3dd4a1
: Merge "Fix aarch64 and x86-64 AndroidConfig.h."
...
* commit '3d3dd4a186309a62a744d7fea1157158e05bcf6e':
Fix aarch64 and x86-64 AndroidConfig.h.
2013-12-18 15:35:58 -08:00
Elliott Hughes
3d3dd4a186
Merge "Fix aarch64 and x86-64 AndroidConfig.h."
2013-12-18 23:31:47 +00:00
Elliott Hughes
98593a66af
Fix aarch64 and x86-64 AndroidConfig.h.
...
_LARGEFILE_SOURCE should never be defined with bionic.
_FILE_OFFSET_BITS should be 64 on 64-bit architectures.
Change-Id: I7acf6b39a3af7782d5d7ad00f709593d96fa8522
2013-12-18 15:17:42 -08:00
Ying Wang
efdad97d8c
am 4493858d
: am 0d16928e
: am 6cc89747
: am 8e3a71f7
: Merge "Simplify the calculation of LOCAL_UNSTRIPPED_PATH"
...
* commit '4493858dc810bfa1f97d4517d469a8890abe40d5':
Simplify the calculation of LOCAL_UNSTRIPPED_PATH
2013-12-18 19:02:56 +00:00
Ying Wang
4493858dc8
am 0d16928e
: am 6cc89747
: am 8e3a71f7
: Merge "Simplify the calculation of LOCAL_UNSTRIPPED_PATH"
...
* commit '0d16928e60d9ed282bb8458a88d22e7fa7a0e485':
Simplify the calculation of LOCAL_UNSTRIPPED_PATH
2013-12-18 19:01:22 +00:00
Ying Wang
0d16928e60
am 6cc89747
: am 8e3a71f7
: Merge "Simplify the calculation of LOCAL_UNSTRIPPED_PATH"
...
* commit '6cc89747ec0c5a553a99acd9be14eb9eaac1c89f':
Simplify the calculation of LOCAL_UNSTRIPPED_PATH
2013-12-18 18:59:38 +00:00
Ying Wang
6cc89747ec
am 8e3a71f7
: Merge "Simplify the calculation of LOCAL_UNSTRIPPED_PATH"
...
* commit '8e3a71f75e08b4ad580903f2edc7edea5dc07806':
Simplify the calculation of LOCAL_UNSTRIPPED_PATH
2013-12-18 10:55:54 -08:00
Ying Wang
8e3a71f75e
Merge "Simplify the calculation of LOCAL_UNSTRIPPED_PATH"
2013-12-18 18:51:51 +00:00
Ying Wang
f3584968ff
Simplify the calculation of LOCAL_UNSTRIPPED_PATH
...
Also this fixes the LOCAL_UNSTRIPPED_PATH if the module is installed to
the vendor dir via LOCAL_PROPRIETARY_MODULE.
Bug: 11289169
Change-Id: Ib07e5761411210963076487fe0e148c259e1e082
2013-12-18 10:41:01 -08:00
Ying Wang
16ab1c7b40
am 106e5c6f
: am 472d0595
: am d32aaf93
: am 3fc636c2
: Merge "Create the dest dir before copying over files."
...
* commit '106e5c6fde8cacf9ed40ab5e61964d62adf9d161':
Create the dest dir before copying over files.
2013-12-18 01:56:00 +00:00
Ying Wang
106e5c6fde
am 472d0595
: am d32aaf93
: am 3fc636c2
: Merge "Create the dest dir before copying over files."
...
* commit '472d0595e9f66f647e387590b6c3ec759d809ab0':
Create the dest dir before copying over files.
2013-12-18 01:51:12 +00:00
Ying Wang
472d0595e9
am d32aaf93
: am 3fc636c2
: Merge "Create the dest dir before copying over files."
...
* commit 'd32aaf9374e6e97fdabd80ac1c2948c262e03af4':
Create the dest dir before copying over files.
2013-12-18 01:48:18 +00:00
Ying Wang
d32aaf9374
am 3fc636c2
: Merge "Create the dest dir before copying over files."
...
* commit '3fc636c25af0ddcce6ebe6f99a1d7ca83b84f69a':
Create the dest dir before copying over files.
2013-12-17 17:45:32 -08:00
Ying Wang
3fc636c25a
Merge "Create the dest dir before copying over files."
2013-12-18 01:40:12 +00:00
Ying Wang
17a7e2bee3
Create the dest dir before copying over files.
...
Change-Id: I8ad79704558d7a10099e64fc1d032c8ddd3330b9
2013-12-17 17:37:16 -08:00
Ying Wang
057375d783
am 03a06f41
: am 9507a0fd
: am 82c59aef
: am 71e8a22e
: Merge "Add DEXPREOPT support for ART"
...
* commit '03a06f4158e9eea9152f25286fcf2c30044d4e06':
Add DEXPREOPT support for ART
2013-12-18 01:06:10 +00:00
Ying Wang
03a06f4158
am 9507a0fd
: am 82c59aef
: am 71e8a22e
: Merge "Add DEXPREOPT support for ART"
...
* commit '9507a0fd36812b27171e8f947d47421005736d25':
Add DEXPREOPT support for ART
2013-12-18 01:03:09 +00:00
Ying Wang
9507a0fd36
am 82c59aef
: am 71e8a22e
: Merge "Add DEXPREOPT support for ART"
...
* commit '82c59aefcd8ad4790ceb957e2840714da937534b':
Add DEXPREOPT support for ART
2013-12-18 01:01:28 +00:00
Ying Wang
82c59aefcd
am 71e8a22e
: Merge "Add DEXPREOPT support for ART"
...
* commit '71e8a22e3478b6b4277957ef47486058a5306286':
Add DEXPREOPT support for ART
2013-12-17 16:58:43 -08:00
Ying Wang
71e8a22e34
Merge "Add DEXPREOPT support for ART"
2013-12-18 00:55:28 +00:00
Christopher Ferris
d6ef972aea
am 5b2d734d
: am 5fb7c74a
: am 7bda5aac
: am d12ee620
: Merge "Re-enable uapi kernel headers for arm."
...
* commit '5b2d734d2ce214f2fb7c91d6326ee600b1a97ceb':
Re-enable uapi kernel headers for arm.
2013-12-17 23:22:41 +00:00
Christopher Ferris
5b2d734d2c
am 5fb7c74a
: am 7bda5aac
: am d12ee620
: Merge "Re-enable uapi kernel headers for arm."
...
* commit '5fb7c74aeb072d56ba41897f5a7fe49394775df9':
Re-enable uapi kernel headers for arm.
2013-12-17 23:19:29 +00:00
Christopher Ferris
5fb7c74aeb
am 7bda5aac
: am d12ee620
: Merge "Re-enable uapi kernel headers for arm."
...
* commit '7bda5aacb1fdb765e2073c00da396bd93db531e5':
Re-enable uapi kernel headers for arm.
2013-12-17 23:15:55 +00:00
Christopher Ferris
7bda5aacb1
am d12ee620
: Merge "Re-enable uapi kernel headers for arm."
...
* commit 'd12ee620b064d262abce691771fe53ba8987d06f':
Re-enable uapi kernel headers for arm.
2013-12-17 15:11:58 -08:00
Christopher Ferris
d12ee620b0
Merge "Re-enable uapi kernel headers for arm."
2013-12-17 23:06:38 +00:00
Brian Carlstrom
ced4bff58e
Add DEXPREOPT support for ART
...
Change-Id: I24d0d7b2a23a769f5d69bd4dc14be22e1475b759
2013-12-17 14:44:00 -08:00
Tim Murray
6bdb49744e
Merge "Add new rs directory to list of Java subdirs of fw/base."
2013-12-17 22:14:28 +00:00
Colin Cross
f1c7471a61
am ceb2f452
: am 59d411c8
: Merge changes I57b49033,I03ddf981 into klp-volantis-dev
...
* commit 'ceb2f452a6a9b94ad9407f69c1bd3a9fc8afd6d0':
Revert "Disable recovery in PDK builds"
pdk: add bouncycastle-host javalib.jar to platform.zip
2013-12-17 21:46:37 +00:00
Colin Cross
ceb2f452a6
am 59d411c8
: Merge changes I57b49033,I03ddf981 into klp-volantis-dev
...
* commit '59d411c8955332349e09f788047b57b2b64eee5e':
Revert "Disable recovery in PDK builds"
pdk: add bouncycastle-host javalib.jar to platform.zip
2013-12-17 21:45:11 +00:00
Colin Cross
59d411c895
Merge changes I57b49033,I03ddf981 into klp-volantis-dev
...
* changes:
Revert "Disable recovery in PDK builds"
pdk: add bouncycastle-host javalib.jar to platform.zip
2013-12-17 21:43:10 +00:00
Scott Main
b0db3411bc
am ade90e43
: am da83d321
: am b8a5a597
: am dab6ac86
: am 518dc751
: Merge "make the new guide/index.html the link for API Guides." into klp-docs
...
* commit 'ade90e433384cd26758ec0fcb9809dd2a8d50105':
make the new guide/index.html the link for API Guides.
2013-12-17 21:36:01 +00:00
Scott Main
ade90e4333
am da83d321
: am b8a5a597
: am dab6ac86
: am 518dc751
: Merge "make the new guide/index.html the link for API Guides." into klp-docs
...
* commit 'da83d321f5da18aac60162fbfe7d2c591e118b71':
make the new guide/index.html the link for API Guides.
2013-12-17 21:32:44 +00:00
Tim Murray
5544519444
Add new rs directory to list of Java subdirs of fw/base.
...
Change-Id: I3213a314e7700162e781526c0450678495442759
2013-12-17 13:30:08 -08:00
Scott Main
da83d321f5
am b8a5a597
: am dab6ac86
: am 518dc751
: Merge "make the new guide/index.html the link for API Guides." into klp-docs
...
* commit 'b8a5a597cd33e3ee8dcbc9edfe3908658851547b':
make the new guide/index.html the link for API Guides.
2013-12-17 21:29:41 +00:00
Scott Main
b8a5a597cd
am dab6ac86
: am 518dc751
: Merge "make the new guide/index.html the link for API Guides." into klp-docs
...
* commit 'dab6ac86013bb9507a59b74abe1b11ab2306f352':
make the new guide/index.html the link for API Guides.
2013-12-17 13:25:17 -08:00
Scott Main
dab6ac8601
am 518dc751
: Merge "make the new guide/index.html the link for API Guides." into klp-docs
...
* commit '518dc751a617c1f182cb01cdc8fd06076d1e91ba':
make the new guide/index.html the link for API Guides.
2013-12-17 21:19:44 +00:00
Scott Main
518dc751a6
Merge "make the new guide/index.html the link for API Guides." into klp-docs
2013-12-17 21:17:29 +00:00
Colin Cross
57b490334a
Revert "Disable recovery in PDK builds"
...
This reverts commit 2e9d15d0b6
.
Bug: 12186985
2013-12-17 12:09:02 -08:00
Colin Cross
074d838590
pdk: add bouncycastle-host javalib.jar to platform.zip
...
Add javalib.jar from bouncycastle-host to the platform.zip to allow
building dumpkey.jar, which is necessary to build recovery.
Host java libraries have no classes.jar, so they have to be kept
in a separate list fromt target java libraries. Also add an implicit
rule to copy the host files out of the pdk fusion intermediates.
Bug: 12186985
Change-Id: I03ddf9810bc7a4ef7aac8427c4607d9eea27cc6b
2013-12-17 12:06:59 -08:00
Elliott Hughes
e3e511b71a
am ce0d80b0
: am 07d4b794
: am 861fea29
: am 3fd89533
: Merge "Make aarch64 more like arm wrt strict-aliasing."
...
* commit 'ce0d80b0aa40f8ec5456ad07fa28c8beac82ded0':
Make aarch64 more like arm wrt strict-aliasing.
2013-12-17 15:50:12 +00:00
Elliott Hughes
ce0d80b0aa
am 07d4b794
: am 861fea29
: am 3fd89533
: Merge "Make aarch64 more like arm wrt strict-aliasing."
...
* commit '07d4b794b82862d78dda116eb53ac485a3186e61':
Make aarch64 more like arm wrt strict-aliasing.
2013-12-17 15:47:20 +00:00
Elliott Hughes
07d4b794b8
am 861fea29
: am 3fd89533
: Merge "Make aarch64 more like arm wrt strict-aliasing."
...
* commit '861fea291dfcb9c536df9849e39f7ba3eca1cd52':
Make aarch64 more like arm wrt strict-aliasing.
2013-12-17 15:44:16 +00:00
Elliott Hughes
861fea291d
am 3fd89533
: Merge "Make aarch64 more like arm wrt strict-aliasing."
...
* commit '3fd895336dc7cfe219be4e1d49096bf53e661503':
Make aarch64 more like arm wrt strict-aliasing.
2013-12-17 07:42:33 -08:00
Elliott Hughes
3fd895336d
Merge "Make aarch64 more like arm wrt strict-aliasing."
2013-12-17 15:39:06 +00:00
Elliott Hughes
c294779d7f
Make aarch64 more like arm wrt strict-aliasing.
...
All thumb code compiles with -fno-strict-aliasing. Let's not make aarch64
porting any more difficult than it needs to be.
Change-Id: I94874df1217b69532c328d7c86c9961631ebde8a
2013-12-16 18:01:19 -08:00
Christopher Ferris
9824ce4e1d
Re-enable uapi kernel headers for arm.
...
Bug: 11559337
Change-Id: Ib914e5f22b10d5a74edc357d42b0dcb223185ab4
2013-12-16 13:58:39 -08:00
Christopher Ferris
68aec9bd01
am c4d168b9
: am bc7064b5
: am 7f36451b
: am 657eadd4
: Merge "Revert "Enable uapi kernel headers for arm.""
...
* commit 'c4d168b9d0d277255ac0473632f2c9bc103fe0f2':
Revert "Enable uapi kernel headers for arm."
2013-12-16 18:43:24 +00:00