OSDN Git Service
Ying Wang [Fri, 27 Dec 2013 20:49:05 +0000 (20:49 +0000)]
am
06d914c8: am
d23bd8f5: Merge "e2fsck missing from emulator"
* commit '
06d914c84119acd7059ee0e76aac8fc703ce83c1':
e2fsck missing from emulator
Ying Wang [Fri, 27 Dec 2013 20:46:31 +0000 (12:46 -0800)]
am
d23bd8f5: Merge "e2fsck missing from emulator"
* commit '
d23bd8f59f396ecd23a54d4e9b798bc872a2e505':
e2fsck missing from emulator
Ying Wang [Fri, 27 Dec 2013 20:41:02 +0000 (20:41 +0000)]
Merge "e2fsck missing from emulator"
Eric Frohnhoefer [Fri, 27 Dec 2013 04:02:34 +0000 (23:02 -0500)]
e2fsck missing from emulator
The emulator file system was recently switched to ext4 however, e2fsck was not
added to the emulator build.
Change-Id: I94621c148fa40d6042b5c86a26815d867a417a6c
See: https://code.google.com/p/android/issues/detail?id=64144
Michael Runge [Thu, 26 Dec 2013 23:37:45 +0000 (23:37 +0000)]
am
41e19a4c: am
6b55f007: am
facd992e: Makefile used spaces instead of a tab
* commit '
41e19a4cf0f10740aa3437b1c2365e49d4f15181':
Makefile used spaces instead of a tab
Michael Runge [Thu, 26 Dec 2013 23:37:44 +0000 (23:37 +0000)]
am
5636d07a: am
a80542db: am
4038aa8f: Enabled incrementals to patch + rename moved files
* commit '
5636d07a29108c77e6b8d38d96b0a1af3bae53ec':
Enabled incrementals to patch + rename moved files
Michael Runge [Thu, 26 Dec 2013 23:33:32 +0000 (15:33 -0800)]
am
6b55f007: am
facd992e: Makefile used spaces instead of a tab
* commit '
6b55f00762c03b3625862b89f704090f58f970e7':
Makefile used spaces instead of a tab
Michael Runge [Thu, 26 Dec 2013 23:33:27 +0000 (15:33 -0800)]
am
a80542db: am
4038aa8f: Enabled incrementals to patch + rename moved files
* commit '
a80542dbf4f193c59525b8749871bcdf4ae4283a':
Enabled incrementals to patch + rename moved files
Elliott Hughes [Sat, 21 Dec 2013 00:00:51 +0000 (00:00 +0000)]
am
9464ca1b: am
b8559790: Merge "Remove a non-existent directory from the include path."
* commit '
9464ca1b97ace55f97c44e3362033fd31de33495':
Remove a non-existent directory from the include path.
Elliott Hughes [Fri, 20 Dec 2013 23:57:57 +0000 (15:57 -0800)]
am
b8559790: Merge "Remove a non-existent directory from the include path."
* commit '
b8559790d43f2483c7910e87e33ceebeb40e9bec':
Remove a non-existent directory from the include path.
Elliott Hughes [Fri, 20 Dec 2013 23:53:32 +0000 (23:53 +0000)]
Merge "Remove a non-existent directory from the include path."
Elliott Hughes [Fri, 20 Dec 2013 23:37:55 +0000 (15:37 -0800)]
Remove a non-existent directory from the include path.
Brings aarch64 in line with the other architectures.
Change-Id: Iba3fd33e34e3b5bc071f55cfe09de9e55a023cf7
Nick Kralevich [Fri, 20 Dec 2013 21:08:08 +0000 (21:08 +0000)]
am
da5d54c8: am
dfabbc68: Merge "Add policy for x86 emulator."
* commit '
da5d54c8ce3e420f828469ca1d8d36b5638ecdaa':
Add policy for x86 emulator.
Nick Kralevich [Fri, 20 Dec 2013 21:06:07 +0000 (13:06 -0800)]
am
dfabbc68: Merge "Add policy for x86 emulator."
* commit '
dfabbc6863494374396a94181c408348824b37ab':
Add policy for x86 emulator.
Nick Kralevich [Fri, 20 Dec 2013 21:01:42 +0000 (21:01 +0000)]
Merge "Add policy for x86 emulator."
Michael Runge [Fri, 20 Dec 2013 20:36:49 +0000 (12:36 -0800)]
am
facd992e: Makefile used spaces instead of a tab
* commit '
facd992ec73de763cfbca32dd6aa38ff76a07613':
Makefile used spaces instead of a tab
Michael Runge [Fri, 20 Dec 2013 19:50:16 +0000 (11:50 -0800)]
Makefile used spaces instead of a tab
Change-Id: Ia34f80d99062ef2899527f11d7bf72e78c63e31c
Michael Runge [Fri, 20 Dec 2013 19:35:07 +0000 (11:35 -0800)]
am
4038aa8f: Enabled incrementals to patch + rename moved files
* commit '
4038aa8fff8c68733bff8b55d8c8d1b59713ca37':
Enabled incrementals to patch + rename moved files
Stephen Smalley [Fri, 20 Dec 2013 18:26:11 +0000 (13:26 -0500)]
Add policy for x86 emulator.
Ying Wang [Thu, 19 Dec 2013 23:49:22 +0000 (23:49 +0000)]
am
1b1a0778: am
3ccb437d: Merge "envsetup.sh: cd to toplevel in get_build_var"
* commit '
1b1a0778636d3f016e869667dfe93a6ab0c3e01f':
envsetup.sh: cd to toplevel in get_build_var
Ying Wang [Thu, 19 Dec 2013 23:46:41 +0000 (15:46 -0800)]
am
3ccb437d: Merge "envsetup.sh: cd to toplevel in get_build_var"
* commit '
3ccb437d939b10d9ea10e01f37618028683ef669':
envsetup.sh: cd to toplevel in get_build_var
Ying Wang [Thu, 19 Dec 2013 23:42:28 +0000 (23:42 +0000)]
Merge "envsetup.sh: cd to toplevel in get_build_var"
Woody Lin [Thu, 19 Dec 2013 10:30:35 +0000 (18:30 +0800)]
Add `htc' to `_vendor_owner_whitelist'
Change-Id: I92bfc8d41d102f687fd8a5b632be3c01c2d005fd
Signed-off-by: Woody Lin <woody_lin@htc.com>
Andrew Boie [Thu, 19 Dec 2013 21:21:46 +0000 (13:21 -0800)]
envsetup.sh: cd to toplevel in get_build_var
dumpvar doesn't work right if we're not called from the toplevel;
due to the way the build system works internally, -C does not
suffice. This was already done in get_abs_build_var.
Redundant -C calls removed since we're at the toplevel already.
Change-Id: Iaaa48982547d099186922cc3ddc417a82c85e9a5
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
David Friedman [Thu, 19 Dec 2013 21:56:53 +0000 (21:56 +0000)]
am
18a13602: am
fc2f4343: am
612a88b7: Added a row for the "All platforms" download line (rebuild stl with debug info package)
* commit '
18a136022e7e7c22ebb597bd2f4b74054fe9dc2f':
Added a row for the "All platforms" download line (rebuild stl with debug info package)
David Friedman [Thu, 19 Dec 2013 21:53:54 +0000 (13:53 -0800)]
am
fc2f4343: am
612a88b7: Added a row for the "All platforms" download line (rebuild stl with debug info package)
* commit '
fc2f4343760976827e35d2b52d8f77d699879613':
Added a row for the "All platforms" download line (rebuild stl with debug info package)
David Friedman [Thu, 19 Dec 2013 21:51:18 +0000 (21:51 +0000)]
am
612a88b7: Added a row for the "All platforms" download line (rebuild stl with debug info package)
* commit '
612a88b7faf5016138f6fbf70f1e89c993b0d2ab':
Added a row for the "All platforms" download line (rebuild stl with debug info package)
David Friedman [Fri, 6 Dec 2013 10:23:14 +0000 (02:23 -0800)]
Added a row for the "All platforms" download line (rebuild stl with debug info package)
Change-Id: I333912e697a389b52b5c768e1218b7d146775c9f
(cherry picked from commit
c25aee29298f1c1658fb274be15724ce60c0b93e)
Scott Main [Thu, 19 Dec 2013 21:17:34 +0000 (21:17 +0000)]
am
0707f784: am
bf9d72ff: am
07816041: set fixed height for header div to ensure the next/prev links in the training bar are always aligned with TOC
* commit '
0707f784f42ee914e274371db13a194a4e07c413':
set fixed height for header div to ensure the next/prev links in the training bar are always aligned with TOC
Scott Main [Thu, 19 Dec 2013 21:15:19 +0000 (13:15 -0800)]
am
bf9d72ff: am
07816041: set fixed height for header div to ensure the next/prev links in the training bar are always aligned with TOC
* commit '
bf9d72ff4d6952c0546a2bf249938dfbe4f7768e':
set fixed height for header div to ensure the next/prev links in the training bar are always aligned with TOC
Scott Main [Thu, 19 Dec 2013 21:12:19 +0000 (21:12 +0000)]
am
07816041: set fixed height for header div to ensure the next/prev links in the training bar are always aligned with TOC
* commit '
078160410ad4209fb78f59ae8e04a6118914cdb5':
set fixed height for header div to ensure the next/prev links in the training bar are always aligned with TOC
Scott Main [Thu, 19 Dec 2013 20:47:38 +0000 (12:47 -0800)]
set fixed height for header div to ensure the next/prev links
in the training bar are always aligned with TOC
Change-Id: I34bb1967e3677bc94298837b0d8f0c6e7bcd8bbf
Colin Cross [Thu, 19 Dec 2013 06:33:59 +0000 (06:33 +0000)]
Merge "build: always include host java files in platform.zip" into klp-volantis-dev
Colin Cross [Thu, 19 Dec 2013 03:36:44 +0000 (19:36 -0800)]
build: always include host java files in platform.zip
Building recovery requires building a host .jar file. Change
platform.zip to always include the necessary host java prebuilts,
instead of only when building the 'platform-java' target.
Bug:
12186985
Change-Id: Ic823d764cb6b39bbf8c5d90c94b5dc99b55d34dc
Elliott Hughes [Wed, 18 Dec 2013 23:38:27 +0000 (23:38 +0000)]
am
d46e3f1f: am
3d3dd4a1: Merge "Fix aarch64 and x86-64 AndroidConfig.h."
* commit '
d46e3f1fdfbd5511fc99fb44fbf272e28a823f8b':
Fix aarch64 and x86-64 AndroidConfig.h.
Elliott Hughes [Wed, 18 Dec 2013 23:35:58 +0000 (15:35 -0800)]
am
3d3dd4a1: Merge "Fix aarch64 and x86-64 AndroidConfig.h."
* commit '
3d3dd4a186309a62a744d7fea1157158e05bcf6e':
Fix aarch64 and x86-64 AndroidConfig.h.
Elliott Hughes [Wed, 18 Dec 2013 23:31:46 +0000 (23:31 +0000)]
Merge "Fix aarch64 and x86-64 AndroidConfig.h."
Elliott Hughes [Wed, 18 Dec 2013 23:17:42 +0000 (15:17 -0800)]
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
Ying Wang [Wed, 18 Dec 2013 18:59:38 +0000 (18:59 +0000)]
am
6cc89747: am
8e3a71f7: Merge "Simplify the calculation of LOCAL_UNSTRIPPED_PATH"
* commit '
6cc89747ec0c5a553a99acd9be14eb9eaac1c89f':
Simplify the calculation of LOCAL_UNSTRIPPED_PATH
Ying Wang [Wed, 18 Dec 2013 18:55:54 +0000 (10:55 -0800)]
am
8e3a71f7: Merge "Simplify the calculation of LOCAL_UNSTRIPPED_PATH"
* commit '
8e3a71f75e08b4ad580903f2edc7edea5dc07806':
Simplify the calculation of LOCAL_UNSTRIPPED_PATH
Ying Wang [Wed, 18 Dec 2013 18:51:50 +0000 (18:51 +0000)]
Merge "Simplify the calculation of LOCAL_UNSTRIPPED_PATH"
Ying Wang [Thu, 14 Nov 2013 01:56:20 +0000 (17:56 -0800)]
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
Ying Wang [Wed, 18 Dec 2013 01:48:18 +0000 (01:48 +0000)]
am
d32aaf93: am
3fc636c2: Merge "Create the dest dir before copying over files."
* commit '
d32aaf9374e6e97fdabd80ac1c2948c262e03af4':
Create the dest dir before copying over files.
Ying Wang [Wed, 18 Dec 2013 01:45:32 +0000 (17:45 -0800)]
am
3fc636c2: Merge "Create the dest dir before copying over files."
* commit '
3fc636c25af0ddcce6ebe6f99a1d7ca83b84f69a':
Create the dest dir before copying over files.
Ying Wang [Wed, 18 Dec 2013 01:40:12 +0000 (01:40 +0000)]
Merge "Create the dest dir before copying over files."
Ying Wang [Wed, 18 Dec 2013 01:37:16 +0000 (17:37 -0800)]
Create the dest dir before copying over files.
Change-Id: I8ad79704558d7a10099e64fc1d032c8ddd3330b9
Ying Wang [Wed, 18 Dec 2013 01:01:28 +0000 (01:01 +0000)]
am
82c59aef: am
71e8a22e: Merge "Add DEXPREOPT support for ART"
* commit '
82c59aefcd8ad4790ceb957e2840714da937534b':
Add DEXPREOPT support for ART
Ying Wang [Wed, 18 Dec 2013 00:58:43 +0000 (16:58 -0800)]
am
71e8a22e: Merge "Add DEXPREOPT support for ART"
* commit '
71e8a22e3478b6b4277957ef47486058a5306286':
Add DEXPREOPT support for ART
Ying Wang [Wed, 18 Dec 2013 00:55:28 +0000 (00:55 +0000)]
Merge "Add DEXPREOPT support for ART"
Christopher Ferris [Tue, 17 Dec 2013 23:15:55 +0000 (23:15 +0000)]
am
7bda5aac: am
d12ee620: Merge "Re-enable uapi kernel headers for arm."
* commit '
7bda5aacb1fdb765e2073c00da396bd93db531e5':
Re-enable uapi kernel headers for arm.
Christopher Ferris [Tue, 17 Dec 2013 23:11:58 +0000 (15:11 -0800)]
am
d12ee620: Merge "Re-enable uapi kernel headers for arm."
* commit '
d12ee620b064d262abce691771fe53ba8987d06f':
Re-enable uapi kernel headers for arm.
Christopher Ferris [Tue, 17 Dec 2013 23:06:38 +0000 (23:06 +0000)]
Merge "Re-enable uapi kernel headers for arm."
Brian Carlstrom [Fri, 15 Nov 2013 07:44:56 +0000 (23:44 -0800)]
Add DEXPREOPT support for ART
Change-Id: I24d0d7b2a23a769f5d69bd4dc14be22e1475b759
Colin Cross [Tue, 17 Dec 2013 21:43:10 +0000 (21:43 +0000)]
Merge changes I57b49033,I03ddf981 into klp-volantis-dev
* changes:
Revert "Disable recovery in PDK builds"
pdk: add bouncycastle-host javalib.jar to platform.zip
Scott Main [Tue, 17 Dec 2013 21:29:41 +0000 (21:29 +0000)]
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.
Scott Main [Tue, 17 Dec 2013 21:25:17 +0000 (13:25 -0800)]
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.
Scott Main [Tue, 17 Dec 2013 21:19:44 +0000 (21:19 +0000)]
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.
Scott Main [Tue, 17 Dec 2013 21:17:29 +0000 (21:17 +0000)]
Merge "make the new guide/index.html the link for API Guides." into klp-docs
Colin Cross [Tue, 17 Dec 2013 20:09:02 +0000 (12:09 -0800)]
Revert "Disable recovery in PDK builds"
This reverts commit
2e9d15d0b647058fed7673fe071953496c6089ca.
Bug:
12186985
Colin Cross [Tue, 17 Dec 2013 20:06:59 +0000 (12:06 -0800)]
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
Elliott Hughes [Tue, 17 Dec 2013 15:44:16 +0000 (15:44 +0000)]
am
861fea29: am
3fd89533: Merge "Make aarch64 more like arm wrt strict-aliasing."
* commit '
861fea291dfcb9c536df9849e39f7ba3eca1cd52':
Make aarch64 more like arm wrt strict-aliasing.
Elliott Hughes [Tue, 17 Dec 2013 15:42:33 +0000 (07:42 -0800)]
am
3fd89533: Merge "Make aarch64 more like arm wrt strict-aliasing."
* commit '
3fd895336dc7cfe219be4e1d49096bf53e661503':
Make aarch64 more like arm wrt strict-aliasing.
Elliott Hughes [Tue, 17 Dec 2013 15:39:06 +0000 (15:39 +0000)]
Merge "Make aarch64 more like arm wrt strict-aliasing."
Elliott Hughes [Tue, 17 Dec 2013 02:01:19 +0000 (18:01 -0800)]
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
Christopher Ferris [Mon, 16 Dec 2013 21:58:39 +0000 (13:58 -0800)]
Re-enable uapi kernel headers for arm.
Bug:
11559337
Change-Id: Ib914e5f22b10d5a74edc357d42b0dcb223185ab4
Michael Runge [Sat, 14 Dec 2013 02:06:28 +0000 (18:06 -0800)]
Enabled incrementals to patch + rename moved files
Change-Id: I551fc5291847e3ace15361c203d86f566c26da97
Christopher Ferris [Mon, 16 Dec 2013 18:37:31 +0000 (18:37 +0000)]
am
7f36451b: am
657eadd4: Merge "Revert "Enable uapi kernel headers for arm.""
* commit '
7f36451b83860f3f5b21edc467605066035354d6':
Revert "Enable uapi kernel headers for arm."
Christopher Ferris [Mon, 16 Dec 2013 18:33:03 +0000 (10:33 -0800)]
am
657eadd4: Merge "Revert "Enable uapi kernel headers for arm.""
* commit '
657eadd4b78b91185ca2042ffb7f92be84e6c1c4':
Revert "Enable uapi kernel headers for arm."
Christopher Ferris [Mon, 16 Dec 2013 18:28:03 +0000 (18:28 +0000)]
Merge "Revert "Enable uapi kernel headers for arm.""
Christopher Ferris [Mon, 16 Dec 2013 18:21:27 +0000 (18:21 +0000)]
Revert "Enable uapi kernel headers for arm."
This reverts commit
88c6c533e17f7bc2e1491310b8d679a91b33aaeb.
Change-Id: I3cd84383c6f217bc6e627e16b2d0c7d948f8131d
Christopher Ferris [Mon, 16 Dec 2013 18:02:28 +0000 (18:02 +0000)]
am
9c15d111: am
84b99aad: Merge "Enable uapi kernel headers for arm."
* commit '
9c15d11156d60e1721dd8e1b3c018b4f0d9a00b0':
Enable uapi kernel headers for arm.
Christopher Ferris [Mon, 16 Dec 2013 17:57:57 +0000 (09:57 -0800)]
am
84b99aad: Merge "Enable uapi kernel headers for arm."
* commit '
84b99aadddf3cd9d02a60b43923ed11fc7341c9f':
Enable uapi kernel headers for arm.
Christopher Ferris [Mon, 16 Dec 2013 17:52:43 +0000 (17:52 +0000)]
Merge "Enable uapi kernel headers for arm."
Christopher Ferris [Mon, 16 Dec 2013 17:12:19 +0000 (09:12 -0800)]
Enable uapi kernel headers for arm.
Bug:
11559337
Change-Id: Idd251338f707b7c6a08f43a79f9784c57142f43c
Ying Wang [Fri, 13 Dec 2013 18:27:08 +0000 (18:27 +0000)]
am
d93df332: am
10b1ffae: Merge "enable PIE for dynamically linked Linux host executables"
* commit '
d93df3321227b167bf68ead55adf76fc12ef8c60':
enable PIE for dynamically linked Linux host executables
Ying Wang [Fri, 13 Dec 2013 18:24:12 +0000 (10:24 -0800)]
am
10b1ffae: Merge "enable PIE for dynamically linked Linux host executables"
* commit '
10b1ffaed921bce3014d39ca9dcb705550aa03f0':
enable PIE for dynamically linked Linux host executables
Ying Wang [Fri, 13 Dec 2013 18:16:26 +0000 (18:16 +0000)]
Merge "enable PIE for dynamically linked Linux host executables"
Joshua J. Drake [Thu, 12 Dec 2013 06:34:29 +0000 (00:34 -0600)]
enable PIE for dynamically linked Linux host executables
Compile all host programs for Android with -fPIE and -pie. This
enables PIE (Position Independent Executables), which helps
protect these applications from exploitation due to memory
management bugs.
Note: PIE *static* executables are not supported at this time. darwin
and windows are also not supported.
Change-Id: I67c1be297711ea23064c349f97ebd02eef3eff09
Ying Wang [Fri, 13 Dec 2013 00:12:47 +0000 (00:12 +0000)]
am
c5e3539b: am
5859f105: Merge "Enable NX protections"
* commit '
c5e3539b6fe67288d097d29b68d5f669b97a71ad':
Enable NX protections
Ying Wang [Fri, 13 Dec 2013 00:09:43 +0000 (16:09 -0800)]
am
5859f105: Merge "Enable NX protections"
* commit '
5859f105fad3ce1ba76fb252c4c5b8fe357a3ce4':
Enable NX protections
Ying Wang [Fri, 13 Dec 2013 00:04:41 +0000 (00:04 +0000)]
Merge "Enable NX protections"
Christopher Ferris [Thu, 12 Dec 2013 22:01:30 +0000 (22:01 +0000)]
am
d6b97d19: am
2c8078fd: Merge "Fix regex for finding symbol data."
* commit '
d6b97d194353b8446ee212151a4cdbbeb71cb31f':
Fix regex for finding symbol data.
Ben Cheng [Thu, 12 Dec 2013 22:01:29 +0000 (22:01 +0000)]
am
af3d1408: am
2609640e: Merge "Add an explicit definition of __ANDROID__=1"
* commit '
af3d1408be4acc8dd6ab0a34d5413c8996f7fa5f':
Add an explicit definition of __ANDROID__=1
Christopher Ferris [Thu, 12 Dec 2013 21:57:55 +0000 (13:57 -0800)]
am
2c8078fd: Merge "Fix regex for finding symbol data."
* commit '
2c8078fdcc7741d848444a01cd81e5dfb8693f15':
Fix regex for finding symbol data.
Ben Cheng [Thu, 12 Dec 2013 21:57:55 +0000 (13:57 -0800)]
am
2609640e: Merge "Add an explicit definition of __ANDROID__=1"
* commit '
2609640eaea1ba89a493cff2847cb9ec993dc9fc':
Add an explicit definition of __ANDROID__=1
Christopher Ferris [Thu, 12 Dec 2013 21:53:08 +0000 (21:53 +0000)]
Merge "Fix regex for finding symbol data."
Ben Cheng [Thu, 12 Dec 2013 21:52:39 +0000 (21:52 +0000)]
Merge "Add an explicit definition of __ANDROID__=1"
Ben Cheng [Thu, 12 Dec 2013 21:07:05 +0000 (13:07 -0800)]
Add an explicit definition of __ANDROID__=1
Once the aarch64 toolchain is refreshed this will be removed.
Also removed some CFLAG duplications.
Change-Id: I42fd86931263af82042ea696196fb25e948fe9cb
Christopher Ferris [Thu, 12 Dec 2013 20:56:16 +0000 (12:56 -0800)]
Fix regex for finding symbol data.
The new output of debuggerd removed a space between the #00 and the rest
of the line. The regex is very restrictive, so fixing it to handle the new
output.
Change-Id: I5259ae1e56a351608b330dfd858a2021e6d89358
Joshua J. Drake [Thu, 12 Dec 2013 06:41:38 +0000 (00:41 -0600)]
Enable NX protections
Add -Wa,--noexecstack and -Wl,-z,noexecstack as default
flags when compiling host-side applications. This enables
NX protections, which prevent code from executing on the
stack or heap. NX protections make exploiting memory
corruption issues more challenging and is an important
security feature.
Change-Id: Iae580abe887e01f9029ec2a4e0fc0aae496724a4
Dirk Dougherty [Wed, 11 Dec 2013 23:31:27 +0000 (23:31 +0000)]
am
4d744829: am
9b022bdf: am
35fe9894: Merge "Doc change: Add tag for DevArt." into klp-docs
* commit '
4d7448291158257d2a74b0fec3c4dd279fb85618':
Doc change: Add tag for DevArt.
Dirk Dougherty [Wed, 11 Dec 2013 23:27:50 +0000 (15:27 -0800)]
am
9b022bdf: am
35fe9894: Merge "Doc change: Add tag for DevArt." into klp-docs
* commit '
9b022bdf8fba6fd3f2185a303e0bf3b3aa2e3d9e':
Doc change: Add tag for DevArt.
Dirk Dougherty [Wed, 11 Dec 2013 23:25:13 +0000 (23:25 +0000)]
am
35fe9894: Merge "Doc change: Add tag for DevArt." into klp-docs
* commit '
35fe9894d283153b0a72741e207a586ff70cd558':
Doc change: Add tag for DevArt.
Dirk Dougherty [Wed, 11 Dec 2013 23:22:10 +0000 (23:22 +0000)]
Merge "Doc change: Add tag for DevArt." into klp-docs
Ying Wang [Wed, 11 Dec 2013 23:17:21 +0000 (23:17 +0000)]
am
d532077a: am
d270230f: Merge "sign_target_files_apks: rewrite build.prop correctly in eng builds"
* commit '
d532077a8ff27b30728b32150c5733dafc783a3d':
sign_target_files_apks: rewrite build.prop correctly in eng builds
Ying Wang [Wed, 11 Dec 2013 23:15:10 +0000 (15:15 -0800)]
am
d270230f: Merge "sign_target_files_apks: rewrite build.prop correctly in eng builds"
* commit '
d270230fa49311901d8797a9e77865c37857d028':
sign_target_files_apks: rewrite build.prop correctly in eng builds
Ying Wang [Wed, 11 Dec 2013 23:11:52 +0000 (23:11 +0000)]
Merge "sign_target_files_apks: rewrite build.prop correctly in eng builds"
Andrew Boie [Wed, 11 Dec 2013 20:42:03 +0000 (12:42 -0800)]
sign_target_files_apks: rewrite build.prop correctly in eng builds
In eng builds, ro.display.id has many space separated items and was
resulting in an error when trying to rewrite it as 'value' gets
turned into a list and never converted back to a string.
Change-Id: I6c8633ed2eb52c56a4097992a32d53d80df4f844
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Ying Wang [Wed, 11 Dec 2013 21:02:29 +0000 (21:02 +0000)]
am
0e2779bd: am
8a373fd5: Merge "Added TARGET_IS_64_BIT flag for x86_64 and aarch64"
* commit '
0e2779bdbb80b6f94534af0b9128ced4b6caa418':
Added TARGET_IS_64_BIT flag for x86_64 and aarch64
Scott Main [Wed, 11 Dec 2013 21:01:41 +0000 (21:01 +0000)]
am
f2fbb21d: am
ecff92d9: resolved conflicts for merge of
79a55d35 to klp-ub-dev
* commit '
f2fbb21de204519877eaf58e2163d9b0da97e0e9':
add Analytics event to track sample downloads (for real this time)