Commit Graph

15325 Commits

Author SHA1 Message Date
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
Michael Runge 4038aa8fff Enabled incrementals to patch + rename moved files
Change-Id: I551fc5291847e3ace15361c203d86f566c26da97
2013-12-16 11:29:51 -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
Christopher Ferris c4d168b9d0 am bc7064b5: am 7f36451b: am 657eadd4: Merge "Revert "Enable uapi kernel headers for arm.""
* commit 'bc7064b5069955a271e56caa28ebc605140d0ca3':
  Revert "Enable uapi kernel headers for arm."
2013-12-16 18:40:30 +00:00
Christopher Ferris bc7064b506 am 7f36451b: am 657eadd4: Merge "Revert "Enable uapi kernel headers for arm.""
* commit '7f36451b83860f3f5b21edc467605066035354d6':
  Revert "Enable uapi kernel headers for arm."
2013-12-16 18:37:31 +00:00
Christopher Ferris 7f36451b83 am 657eadd4: Merge "Revert "Enable uapi kernel headers for arm.""
* commit '657eadd4b78b91185ca2042ffb7f92be84e6c1c4':
  Revert "Enable uapi kernel headers for arm."
2013-12-16 10:33:03 -08:00
Christopher Ferris 657eadd4b7 Merge "Revert "Enable uapi kernel headers for arm."" 2013-12-16 18:28:03 +00:00
Christopher Ferris e2c73b3194 Revert "Enable uapi kernel headers for arm."
This reverts commit 88c6c533e1.

Change-Id: I3cd84383c6f217bc6e627e16b2d0c7d948f8131d
2013-12-16 18:21:27 +00:00
Christopher Ferris 84c6144c52 am 675041d1: am 5e55aabc: am 9c15d111: am 84b99aad: Merge "Enable uapi kernel headers for arm."
* commit '675041d128a87378c959fd4b75bfe949a3818947':
  Enable uapi kernel headers for arm.
2013-12-16 18:08:39 +00:00
Christopher Ferris 675041d128 am 5e55aabc: am 9c15d111: am 84b99aad: Merge "Enable uapi kernel headers for arm."
* commit '5e55aabcb31490c10b04cb319ebb654a3087e864':
  Enable uapi kernel headers for arm.
2013-12-16 18:06:08 +00:00
Christopher Ferris 5e55aabcb3 am 9c15d111: am 84b99aad: Merge "Enable uapi kernel headers for arm."
* commit '9c15d11156d60e1721dd8e1b3c018b4f0d9a00b0':
  Enable uapi kernel headers for arm.
2013-12-16 18:02:28 +00:00
Christopher Ferris 9c15d11156 am 84b99aad: Merge "Enable uapi kernel headers for arm."
* commit '84b99aadddf3cd9d02a60b43923ed11fc7341c9f':
  Enable uapi kernel headers for arm.
2013-12-16 09:57:57 -08:00
Christopher Ferris 84b99aaddd Merge "Enable uapi kernel headers for arm." 2013-12-16 17:52:43 +00:00
Christopher Ferris 88c6c533e1 Enable uapi kernel headers for arm.
Bug: 11559337
Change-Id: Idd251338f707b7c6a08f43a79f9784c57142f43c
2013-12-16 09:12:19 -08:00
Ying Wang dcdd759623 am 39139ee0: am 3d10656e: am d93df332: am 10b1ffae: Merge "enable PIE for dynamically linked Linux host executables"
* commit '39139ee09a82b232877e10b2e1832664382d4257':
  enable PIE for dynamically linked Linux host executables
2013-12-13 22:19:39 +00:00
Ying Wang 39139ee09a am 3d10656e: am d93df332: am 10b1ffae: Merge "enable PIE for dynamically linked Linux host executables"
* commit '3d10656e99e787cba9d2c9eba74d1a717ecb9e98':
  enable PIE for dynamically linked Linux host executables
2013-12-13 18:28:50 +00:00
Ying Wang 3d10656e99 am d93df332: am 10b1ffae: Merge "enable PIE for dynamically linked Linux host executables"
* commit 'd93df3321227b167bf68ead55adf76fc12ef8c60':
  enable PIE for dynamically linked Linux host executables
2013-12-13 18:27:08 +00:00
Ying Wang d93df33212 am 10b1ffae: Merge "enable PIE for dynamically linked Linux host executables"
* commit '10b1ffaed921bce3014d39ca9dcb705550aa03f0':
  enable PIE for dynamically linked Linux host executables
2013-12-13 10:24:12 -08:00
Ying Wang 10b1ffaed9 Merge "enable PIE for dynamically linked Linux host executables" 2013-12-13 18:16:26 +00:00
Joshua J. Drake b0eafa21b9 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
2013-12-12 17:36:53 -08:00
Ying Wang a27fd616c0 am 5023bb57: am 31570961: am c5e3539b: am 5859f105: Merge "Enable NX protections"
* commit '5023bb574f5e0e29a8434734ca1db52b6a35bf6a':
  Enable NX protections
2013-12-13 00:17:27 +00:00
Ying Wang 5023bb574f am 31570961: am c5e3539b: am 5859f105: Merge "Enable NX protections"
* commit '3157096157778278a34dd5d03cff24023d69251e':
  Enable NX protections
2013-12-13 00:15:05 +00:00
Ying Wang 3157096157 am c5e3539b: am 5859f105: Merge "Enable NX protections"
* commit 'c5e3539b6fe67288d097d29b68d5f669b97a71ad':
  Enable NX protections
2013-12-13 00:12:47 +00:00
Ying Wang c5e3539b6f am 5859f105: Merge "Enable NX protections"
* commit '5859f105fad3ce1ba76fb252c4c5b8fe357a3ce4':
  Enable NX protections
2013-12-12 16:09:43 -08:00
Ying Wang 5859f105fa Merge "Enable NX protections" 2013-12-13 00:04:42 +00:00
Christopher Ferris 76e1e737fa am 12fabd87: am b6838aa4: am d6b97d19: am 2c8078fd: Merge "Fix regex for finding symbol data."
* commit '12fabd87696f0a3e14e1f50f635a4ed22dba0b3c':
  Fix regex for finding symbol data.
2013-12-12 22:07:00 +00:00
Ben Cheng 92dd82a6e2 am 462b1ca7: am 74f27cff: am af3d1408: am 2609640e: Merge "Add an explicit definition of __ANDROID__=1"
* commit '462b1ca7f6268282f147961aa03ca2433d59af17':
  Add an explicit definition of __ANDROID__=1
2013-12-12 22:06:59 +00:00
Christopher Ferris 12fabd8769 am b6838aa4: am d6b97d19: am 2c8078fd: Merge "Fix regex for finding symbol data."
* commit 'b6838aa47d18918c329e7d544b325086c3f8883b':
  Fix regex for finding symbol data.
2013-12-12 22:03:41 +00:00
Ben Cheng 462b1ca7f6 am 74f27cff: am af3d1408: am 2609640e: Merge "Add an explicit definition of __ANDROID__=1"
* commit '74f27cffd9bbbd0f791e1f0f0096f706c91ad08f':
  Add an explicit definition of __ANDROID__=1
2013-12-12 22:03:40 +00:00
Christopher Ferris b6838aa47d am d6b97d19: am 2c8078fd: Merge "Fix regex for finding symbol data."
* commit 'd6b97d194353b8446ee212151a4cdbbeb71cb31f':
  Fix regex for finding symbol data.
2013-12-12 22:01:30 +00:00
Ben Cheng 74f27cffd9 am af3d1408: am 2609640e: Merge "Add an explicit definition of __ANDROID__=1"
* commit 'af3d1408be4acc8dd6ab0a34d5413c8996f7fa5f':
  Add an explicit definition of __ANDROID__=1
2013-12-12 22:01:29 +00:00
Christopher Ferris d6b97d1943 am 2c8078fd: Merge "Fix regex for finding symbol data."
* commit '2c8078fdcc7741d848444a01cd81e5dfb8693f15':
  Fix regex for finding symbol data.
2013-12-12 13:57:55 -08:00