Commit Graph

11525 Commits

Author SHA1 Message Date
The Android Open Source Project 16cb8655bd Reconcile with jb-mr1-release - do not merge
Change-Id: I8c4ba6b279cebcc46d7b7cb71c81f1de96962ca9
2012-12-12 07:38:42 -08:00
The Android Open Source Project 4c52d70152 am c9b99362: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit 'c9b993620b5648dac65804cb6a314aad1d58432d':
  JDP72B
  JDP72
2012-12-12 07:36:23 -08:00
The Android Open Source Project c9b993620b Reconcile with jb-mr1.1-release - do not merge
Change-Id: Idb85365d68dc7637fb2efd3213eacb49c0e26785
2012-12-12 07:33:50 -08:00
The Android Automerger 29132ce84b JDP72B 2012-12-11 23:59:23 -08:00
Ben Cheng 02d29216c9 am b3a68f6e: am 62f1d86e: Merge "Define TARGET_GCC_VERSION in target specific make files."
* commit 'b3a68f6e002cdbc946d08a76656067d63542a98a':
  Define TARGET_GCC_VERSION in target specific make files.
2012-12-11 16:53:05 -08:00
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 29e21d40ac am 7c6658ea: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '7c6658ea71f5aa3a3614cd2dbde123b831850e55':
  JDP71B
2012-12-11 11:55:30 -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 b3f0eb16b2 am 7cd20491: am a303510f: Merge "x86: enable FORTIFY_SOURCE"
* commit '7cd204914ef59c4ce96210539489ec3e76942bb4':
  x86: enable FORTIFY_SOURCE
2012-12-11 10:35:17 -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 96ddf10e33 am 297e28a9: am a7b85086: Merge "Export TARGET_GCC_VERSION as an env variable."
* commit '297e28a9a713346dfb5d91630c96d365a6e69750':
  Export TARGET_GCC_VERSION as an env variable.
2012-12-10 17:36:35 -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 3d252cee2e am 626eb453: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '626eb453cab7d19ebf9b8e536e0c0da6cc64e4cf':
  JDP71
  JDP68
2012-12-10 15:21:33 -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 (Jun 4th 2012)

Change-Id: Idae6f93d37ddae605088867cd3029f12632456e1
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 d019ecc246 am 312038af: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '312038af92df10fb8787852fa73b66d5c2e31f7f':
  JDP67B
2012-12-07 07:54:47 -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 b8d6078197 am 37dc9a20: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '37dc9a20f045436ef9ff8a15f70eda746f411ab4':
  JDP67
2012-12-06 10:47:52 -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 c88dea4ebe am 7d091828: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '7d091828d937fd7895a20026a81fec9981ad0717':
  JDP66
  JDP65
2012-12-05 13:00:48 -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
Ying Wang 19cc22bc9c Move numeric api files from frameworks/base to prebuilts/sdk
So they can be used in unbundled builds.

Bug: 7296240
Change-Id: I5f176322dec30323f365188fb3e379def60dc1b8
2012-12-04 15:07:34 -08:00
Ying Wang ae5979bd24 Merge "Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too" 2012-12-03 18:33:54 -08:00
Ying Wang fe3f62d06b Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
Change-Id: I09e8e849f642792e3a74e2564820ab9bbf1eb28c
2012-12-03 18:24:55 -08:00
Chris Wren dba068e1ff am f28aae60: am abc791fc: am 801a0792: Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev
* commit 'f28aae60adb462bba0cfe26ccf9ca80121ca1b7d':
  unbundle photo dreams into the GalleryGoogle package
2012-12-03 18:01:14 -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