Ben Cheng
b3a68f6e00
am 62f1d86e: Merge "Define TARGET_GCC_VERSION in target specific make files."
...
* commit '62f1d86e4850bdc4f470cf1f0c2428f5b427a347':
Define TARGET_GCC_VERSION in target specific make files.
2012-12-11 16:51:13 -08:00
Ben Cheng
5011dd80ee
Refresh ARM toolchain to GCC 4.7 / binutils 2.22.
...
Change-Id: Id3689376ae4c4fc183569955b2ee98df5c069510
2012-12-11 16:41:01 -08:00
The Android Automerger
2710dcbac8
JDP72
2012-12-11 15:57:10 -08:00
The Android Automerger
bd2e0d776c
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-11 15:56:16 -08:00
Ben Cheng
62f1d86e48
Merge "Define TARGET_GCC_VERSION in target specific make files."
2012-12-11 15:52:02 -08:00
Ying Wang
6a6c11215b
Run e2fsck on built sparse images.
...
Bug: 7591683
Change-Id: Id1cba79f7840aab1f0327cb741eda655b45d1b46
2012-12-11 14:57:39 -08:00
Ben Cheng
054ffd2e7c
Define TARGET_GCC_VERSION in target specific make files.
...
So that GCC refresh can be performed in a target specific way.
Change-Id: I867e8b8fd671bef8c5af300e657a6da4fface032
2012-12-11 14:03:18 -08:00
The Android Automerger
acb046abd0
JOP40F
2012-12-11 13:59:16 -08:00
The Android Open Source Project
7c6658ea71
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: Idcf1a5e4acf53a40deeb6304d83a734722c7aff4
2012-12-11 11:53:49 -08:00
Nick Kralevich
7cd204914e
am a303510f: Merge "x86: enable FORTIFY_SOURCE"
...
* commit 'a303510f133e0e20aefedd7d03adfbb88cb85a54':
x86: enable FORTIFY_SOURCE
2012-12-11 10:33:14 -08:00
Nick Kralevich
a303510f13
Merge "x86: enable FORTIFY_SOURCE"
2012-12-11 08:41:36 -08:00
The Android Automerger
aa81ebb808
JDP71B
2012-12-10 19:34:09 -08:00
The Android Automerger
77072f9d6f
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-10 19:33:28 -08:00
Ben Cheng
297e28a9a7
am a7b85086: Merge "Export TARGET_GCC_VERSION as an env variable."
...
* commit 'a7b850864c54bb6f223d4b186c5937fd20aa68d8':
Export TARGET_GCC_VERSION as an env variable.
2012-12-10 17:02:27 -08:00
Ben Cheng
a7b850864c
Merge "Export TARGET_GCC_VERSION as an env variable."
2012-12-10 16:37:33 -08:00
Ben Cheng
1526670628
Export TARGET_GCC_VERSION as an env variable.
...
Have it referenced by the adbs tool to pick the specified toolchain.
Change-Id: I23df88946254a55d0749d6753e54559faf33e121
2012-12-10 16:06:16 -08:00
The Android Open Source Project
626eb453ca
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: Icabdf5fba2bdced2fbb6855e237b875f35ea0475
2012-12-10 15:19:15 -08:00
The Android Automerger
80998ee71f
JDP71
2012-12-10 13:06:33 -08:00
The Android Automerger
8af65fef4b
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-10 13:05:46 -08:00
Nick Kralevich
40febcad47
x86: enable FORTIFY_SOURCE
...
Enable FORTIFY_SOURCE for Android x86. This adds certain security
protections to Android programs, checking for common programming
mistakes and buffer overflows.
FORTIFY_SOURCE protections have been enabled for ARM since
a46c480e43
2012-12-07 17:20:28 -08:00
The Android Automerger
be247ab34a
JDP68
2012-12-07 13:26:40 -08:00
The Android Automerger
bc9ff47216
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-07 13:26:02 -08:00
The Android Open Source Project
312038af92
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: If99ecfdce01c838237eaa9ae3e403fcee0a5892c
2012-12-07 07:52:39 -08:00
The Android Automerger
c536a0fe50
JDP67B
2012-12-06 19:36:51 -08:00
The Android Automerger
4bca2f516c
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-06 19:35:57 -08:00
The Android Open Source Project
37dc9a20f0
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I487fc4f0fc8050e6f59985a25ad7add411a97a78
2012-12-06 10:46:43 -08:00
The Android Automerger
1e34606fff
JDP67
2012-12-06 10:40:18 -08:00
The Android Automerger
3e50c966a9
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-06 10:39:05 -08:00
The Android Open Source Project
7d091828d9
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I98737a9d0c206077d1faac71b40a14157f575d82
2012-12-05 11:08:38 -08:00
The Android Automerger
2f74b6d8cc
JDP66
2012-12-05 10:28:18 -08:00
The Android Automerger
f2f1d7f8f2
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-05 10:27:36 -08:00
The Android Automerger
582c34b60e
JDP65
2012-12-04 20:00:08 -08:00
The Android Automerger
1de9eda618
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-04 19:58:36 -08:00
Chris Wren
f28aae60ad
am abc791fc: am 801a0792: Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev
...
* commit 'abc791fc5723bee48763a67a497ae25ac203b65b':
unbundle photo dreams into the GalleryGoogle package
2012-12-03 17:59:25 -08:00
Chris Wren
abc791fc57
am 801a0792: Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev
...
* commit '801a079269d78e29c105462518dd4876dd031b2e':
unbundle photo dreams into the GalleryGoogle package
2012-12-03 17:56:51 -08:00
Chris Wren
801a079269
Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev
2012-12-03 17:54:34 -08:00
Ying Wang
d3a561da10
am f8b804f8: Merge "Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true"
...
* commit 'f8b804f8c532c6d913d8389f9a8e4c05a8f0310c':
Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true
2012-12-03 16:07:25 -08:00
Ying Wang
f8b804f8c5
Merge "Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true"
2012-12-03 16:00:27 -08:00
The Android Open Source Project
b1ba5ec9cf
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I1dacc7eb56c438ce9ab211ebdc1b19860bddc0c9
2012-12-03 15:58:04 -08:00
The Android Automerger
6d302128db
JDP64B
2012-12-03 15:54:56 -08:00
The Android Automerger
e21aec999d
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-03 15:54:17 -08:00
Ying Wang
96aa714534
Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true
...
Change-Id: Id516716eaa90534f1b51133d5fb97468e52802dd
2012-12-03 15:49:13 -08:00
Jean-Baptiste Queru
0f4e3718df
Merge d2e4c25e
...
Change-Id: I7d92c594498f6b4c8277d3a54d54b9724da04408
2012-12-03 14:46:37 -08:00
Dianne Hackborn
d2e4c25e3f
am b7157909: Merge "Obviously JB MR1.1 should be Android 4.2.2." into jb-mr1.1-dev
...
* commit 'b7157909185968064db922bff6d7b1baabe305f4':
Obviously JB MR1.1 should be Android 4.2.2.
2012-12-03 14:26:03 -08:00
Dianne Hackborn
b715790918
Merge "Obviously JB MR1.1 should be Android 4.2.2." into jb-mr1.1-dev
2012-12-03 14:24:04 -08:00
Robert Ly
70b80f2a9e
am 7bfd28d7: am 4bfc9991: am 5c0f9e99: Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev
...
* commit '7bfd28d74468845b5d2ef0db7753ef1e0075a575':
fix docs.js bug where changeApiLevel is getting called
2012-12-03 13:03:41 -08:00
Robert Ly
b1202d1512
am 54c59287: am fd3b957b: am f88a53d5: Merge "docs: support google css class for reference docs" into jb-mr1-dev
...
* commit '54c59287722c354f7a8d326e8d5d144cef715b6e':
docs: support google css class for reference docs
2012-12-03 13:03:40 -08:00
Robert Ly
7bfd28d744
am 4bfc9991: am 5c0f9e99: Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev
...
* commit '4bfc9991b49fe2e4e2e77b61c4abe7e38eea6777':
fix docs.js bug where changeApiLevel is getting called
2012-12-03 13:00:45 -08:00
Robert Ly
54c5928772
am fd3b957b: am f88a53d5: Merge "docs: support google css class for reference docs" into jb-mr1-dev
...
* commit 'fd3b957b4a63504e31801367056a0fb954e15c9c':
docs: support google css class for reference docs
2012-12-03 13:00:44 -08:00
Robert Ly
4bfc9991b4
am 5c0f9e99: Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev
...
* commit '5c0f9e996a819806e5f088ded011bd30ef9c46d7':
fix docs.js bug where changeApiLevel is getting called
2012-12-03 12:59:24 -08:00
