Commit graph

23018 commits

Author SHA1 Message Date
Sami Tolvanen
3edeb4e97b am 045d817c: am 497b74d5: am d21d1d27: am 00e1f003: Merge "Check partition hash before resorting to block_image_verify"
* commit '045d817cce8cb1feb0186b537306cabf1a5069cd':
  Check partition hash before resorting to block_image_verify
2015-04-25 10:01:53 +00:00
Sami Tolvanen
045d817cce am 497b74d5: am d21d1d27: am 00e1f003: Merge "Check partition hash before resorting to block_image_verify"
* commit '497b74d5a28d9471566159535038e454ffa15857':
  Check partition hash before resorting to block_image_verify
2015-04-25 09:48:19 +00:00
Sami Tolvanen
497b74d5a2 am d21d1d27: am 00e1f003: Merge "Check partition hash before resorting to block_image_verify"
* commit 'd21d1d273b83e701667beeabe0c76fd6888e15fc':
  Check partition hash before resorting to block_image_verify
2015-04-25 09:32:33 +00:00
Sami Tolvanen
d21d1d273b am 00e1f003: Merge "Check partition hash before resorting to block_image_verify"
* commit '00e1f0033eede8f23ff72097c98b7fd70a4e349d':
  Check partition hash before resorting to block_image_verify
2015-04-25 08:07:04 +00:00
Sami Tolvanen
00e1f0033e Merge "Check partition hash before resorting to block_image_verify" 2015-04-25 08:00:03 +00:00
Nick Kralevich
b126ae9e3a am c98d6b35: am 6612d4a0: am edc3371a: am f3a6b07b: Merge "host compiler: enable compiler hardening flags"
* commit 'c98d6b35ba7e9381089b1b7c8b47f384e5772a4f':
  host compiler: enable compiler hardening flags
2015-04-25 05:15:48 +00:00
Nick Kralevich
c98d6b35ba am 6612d4a0: am edc3371a: am f3a6b07b: Merge "host compiler: enable compiler hardening flags"
* commit '6612d4a0888bce32ff987e9897dede9829b5a822':
  host compiler: enable compiler hardening flags
2015-04-25 05:04:39 +00:00
Nick Kralevich
6612d4a088 am edc3371a: am f3a6b07b: Merge "host compiler: enable compiler hardening flags"
* commit 'edc3371aeaf0f963d95b4d8bfb0e35b8b17ee648':
  host compiler: enable compiler hardening flags
2015-04-25 04:54:12 +00:00
Nick Kralevich
edc3371aea am f3a6b07b: Merge "host compiler: enable compiler hardening flags"
* commit 'f3a6b07b80a32b822f63cb1d34de64e8395484a8':
  host compiler: enable compiler hardening flags
2015-04-25 04:44:34 +00:00
Nick Kralevich
f3a6b07b80 Merge "host compiler: enable compiler hardening flags" 2015-04-25 04:35:46 +00:00
Nick Kralevich
100acd1001 host compiler: enable compiler hardening flags
Enable the following compiler hardening flags:

* -Wl,-z,relro
* -Wl,-z,now
* -fstack-protector

relro / bind_now make the relro region read-only after linking,
preventing certain attacks against ELF data structures.

stack-protector adds stack canaries, which can detect exploits
which overwrite parts of the stack.

Explicitly not added in this change is FORTIFY_SOURCE=2. Adding that
option turns on glibc's warn_unused_result attributes. This generates
a huge number of new compile time warnings, and for the multiple
makefiles which have -Werror in them, turns those warnings into errors.
I'm not able to fix all the errors right away.

Bug: 20558757
Change-Id: I86791177c6695f5325233d9dd9a5dd3ccc2b1a2f
2015-04-24 21:26:08 -07:00
Dmitriy Ivanov
0be46e11a6 am 80421984: am aac1b9d9: am f674a67d: am 573dfb7c: Merge "Pack relocations for mips64"
* commit '804219841d7f581cf78f3f68e13381b6631513a0':
  Pack relocations for mips64
2015-04-25 00:31:30 +00:00
Dmitriy Ivanov
804219841d am aac1b9d9: am f674a67d: am 573dfb7c: Merge "Pack relocations for mips64"
* commit 'aac1b9d9bfc82aa739c7f38c82538ac73ea1040f':
  Pack relocations for mips64
2015-04-25 00:20:48 +00:00
Dmitriy Ivanov
aac1b9d9bf am f674a67d: am 573dfb7c: Merge "Pack relocations for mips64"
* commit 'f674a67d6ef3d446dd726ce9600bd905815506b6':
  Pack relocations for mips64
2015-04-25 00:09:51 +00:00
Dmitriy Ivanov
f674a67d6e am 573dfb7c: Merge "Pack relocations for mips64"
* commit '573dfb7cb8f768452744ddb781cc65412ed1a618':
  Pack relocations for mips64
2015-04-24 23:59:03 +00:00
Dmitriy Ivanov
573dfb7cb8 Merge "Pack relocations for mips64" 2015-04-24 23:52:40 +00:00
Dmitriy Ivanov
155d7cc845 am 7347196a: am df7afb47: am 3b023915: am 4fa4e4be: Merge "Do not pack relocations for prebuilts by default"
* commit '7347196acbf640caaf68e4e790489a40d770a083':
  Do not pack relocations for prebuilts by default
2015-04-24 23:36:21 +00:00
Dmitriy Ivanov
8bd30fe3cb Pack relocations for mips64
Bug: http://b/18051137
Change-Id: I063c5d6cf007658c0efe9cb1d65ed8026b3e7dae
2015-04-24 16:34:09 -07:00
Dmitriy Ivanov
7347196acb am df7afb47: am 3b023915: am 4fa4e4be: Merge "Do not pack relocations for prebuilts by default"
* commit 'df7afb47d8d69f53316218dd4b0510aa8201ce7c':
  Do not pack relocations for prebuilts by default
2015-04-24 23:26:31 +00:00
Dmitriy Ivanov
df7afb47d8 am 3b023915: am 4fa4e4be: Merge "Do not pack relocations for prebuilts by default"
* commit '3b023915e8374341c6a69cd40b0811e10b3cb1b5':
  Do not pack relocations for prebuilts by default
2015-04-24 23:14:00 +00:00
Dmitriy Ivanov
3b023915e8 am 4fa4e4be: Merge "Do not pack relocations for prebuilts by default"
* commit '4fa4e4befd5bc88ab37d7c7b20d3a67d351a1925':
  Do not pack relocations for prebuilts by default
2015-04-24 23:04:46 +00:00
Dmitriy Ivanov
4fa4e4befd Merge "Do not pack relocations for prebuilts by default" 2015-04-24 22:56:08 +00:00
Dmitriy Ivanov
64762c3027 Do not pack relocations for prebuilts by default
Do not pack relocations for prebuilds unless
 LOCAL_PACK_MODULE_RELOCATIONS is true

Bug: http://b/20537715
Bug: http://b/18051137
Change-Id: Iddef3b09741da6ae10d73c98103b868cc7695d38
2015-04-24 15:33:14 -07:00
Dmitriy Ivanov
a705b5651d am 10537b6f: am 513be561: am cae46525: am 691a4379: Merge "Pack relocations for mips"
* commit '10537b6f41342c50fc0c80bd85ff1b126054086f':
  Pack relocations for mips
2015-04-24 21:09:38 +00:00
Dmitriy Ivanov
10537b6f41 am 513be561: am cae46525: am 691a4379: Merge "Pack relocations for mips"
* commit '513be561e9eca26bd73a0a6c8c2764b20430d60f':
  Pack relocations for mips
2015-04-24 20:12:37 +00:00
Dmitriy Ivanov
513be561e9 am cae46525: am 691a4379: Merge "Pack relocations for mips"
* commit 'cae4652514c220d1b8d9fbbdca1204bc6cb25954':
  Pack relocations for mips
2015-04-24 20:05:03 +00:00
Dmitriy Ivanov
cae4652514 am 691a4379: Merge "Pack relocations for mips"
* commit '691a4379c3386e39fc362d632acca5276060c23a':
  Pack relocations for mips
2015-04-24 19:55:39 +00:00
Dmitriy Ivanov
691a4379c3 Merge "Pack relocations for mips" 2015-04-24 19:45:22 +00:00
Dmitriy Ivanov
9dc1a7359f Pack relocations for mips
Bug: http://b/18051137
Change-Id: Id5e0adfb55273f23e1c99b4eecb318c6b8d19989
2015-04-24 12:20:02 -07:00
Dmitriy Ivanov
d96e487b9b am 5754ad7e: am 5c327ec3: am 0f7ecd64: am b1c2727a: Merge "Pack relocations for x86"
* commit '5754ad7ead23fb613f9fe4de2970283d18141ea5':
  Pack relocations for x86
2015-04-24 18:28:05 +00:00
Dmitriy Ivanov
5754ad7ead am 5c327ec3: am 0f7ecd64: am b1c2727a: Merge "Pack relocations for x86"
* commit '5c327ec39cc83f1f87f012abb29a9b13a0be02b7':
  Pack relocations for x86
2015-04-24 18:16:35 +00:00
Dmitriy Ivanov
5c327ec39c am 0f7ecd64: am b1c2727a: Merge "Pack relocations for x86"
* commit '0f7ecd648bd5aa7f2798615559eb2cfd72e5d918':
  Pack relocations for x86
2015-04-24 18:07:03 +00:00
Dmitriy Ivanov
0f7ecd648b am b1c2727a: Merge "Pack relocations for x86"
* commit 'b1c2727aecfbd769bc002e1feeea0f6b745c9795':
  Pack relocations for x86
2015-04-24 17:54:11 +00:00
Dmitriy Ivanov
b1c2727aec Merge "Pack relocations for x86" 2015-04-24 17:44:09 +00:00
Dmitriy Ivanov
1d4804ccd1 Pack relocations for x86
Bug: http://b/18051137
Change-Id: I3f316343e9bbd2037a9583d5b6fb41a06be153cd
2015-04-24 10:34:59 -07:00
Sami Tolvanen
e09d096ed6 Check partition hash before resorting to block_image_verify
It's not necessary to call block_image_verify for the most common
case where we attempt an update for the first time and the target
partition has expected contents. It is sufficient to confirm that
the target partition is intact.

Computing a hash is much faster than simulating the update, which
means this change should make the update speed for v3 much closer
to v2 for the common case. If the update was interrupted, this is
going to make resuming somewhat slower, of course. Hopefully this
should be rather rare.

Bug: 20309033
Change-Id: I04792f3681bf2cd5d9a4e1c41eb883c7f26c6f58
2015-04-24 10:56:59 +00:00
Dmitriy Ivanov
7fa5ba1d22 am 6a2b812b: am cda3d433: am eacc8a05: am 529943c7: Merge "Disable packed relocations for NDK builds"
* commit '6a2b812b8cc5ac7ea051d2c09651e12d08217919':
  Disable packed relocations for NDK builds
2015-04-24 05:30:47 +00:00
Dmitriy Ivanov
6a2b812b8c am cda3d433: am eacc8a05: am 529943c7: Merge "Disable packed relocations for NDK builds"
* commit 'cda3d43345a43059065b538b63228007a2da62fc':
  Disable packed relocations for NDK builds
2015-04-24 05:19:24 +00:00
Dmitriy Ivanov
cda3d43345 am eacc8a05: am 529943c7: Merge "Disable packed relocations for NDK builds"
* commit 'eacc8a052f30fc78a9b593a8b7bd4f0f8f5eb7d3':
  Disable packed relocations for NDK builds
2015-04-24 05:10:51 +00:00
Dmitriy Ivanov
eacc8a052f am 529943c7: Merge "Disable packed relocations for NDK builds"
* commit '529943c7234a20de4eeb489df9f1c896a09b345f':
  Disable packed relocations for NDK builds
2015-04-24 04:59:15 +00:00
Dmitriy Ivanov
529943c723 Merge "Disable packed relocations for NDK builds" 2015-04-24 04:48:44 +00:00
Dmitriy Ivanov
3b51f20be9 Disable packed relocations for NDK builds
Bug: http://b/20537715
Change-Id: I1289a88d5eb694980b026b695cb25edd8ba76ed5
2015-04-23 18:55:23 -07:00
Dmitriy Ivanov
be55caf288 am 6f2935dc: am dabf96ab: am c84b3a78: am 648f1b66: Merge "Pack relocation tables for dynamic executables"
* commit '6f2935dc1432a38e149498b6efbd43ed9aceb827':
  Pack relocation tables for dynamic executables
2015-04-23 23:16:36 +00:00
Dmitriy Ivanov
6f2935dc14 am dabf96ab: am c84b3a78: am 648f1b66: Merge "Pack relocation tables for dynamic executables"
* commit 'dabf96ab0a0761539a5d01043d9a2f5b261c80a0':
  Pack relocation tables for dynamic executables
2015-04-23 22:46:33 +00:00
Dmitriy Ivanov
dabf96ab0a am c84b3a78: am 648f1b66: Merge "Pack relocation tables for dynamic executables"
* commit 'c84b3a781c0065cba994e8cdd49b6bdb51e93399':
  Pack relocation tables for dynamic executables
2015-04-23 22:35:01 +00:00
Dmitriy Ivanov
c84b3a781c am 648f1b66: Merge "Pack relocation tables for dynamic executables"
* commit '648f1b66b4a6532383d5382148d586d354026305':
  Pack relocation tables for dynamic executables
2015-04-23 22:28:49 +00:00
Dmitriy Ivanov
648f1b66b4 Merge "Pack relocation tables for dynamic executables" 2015-04-23 22:20:37 +00:00
Dmitriy Ivanov
4c2d1a64fb Pack relocation tables for dynamic executables
Add replocation-packer step for dynmic executables.

  Enable it by default for arm and arm64 platforms.

Bug: http://b/18051137
Change-Id: I0c88fd31595bcea62a087f219acb9ecf9c80f2e5
2015-04-23 12:07:16 -07:00
Dimitry Ivanov
bc83d0bb68 am 893ed24d: am 387a9fee: am 941d61de: am 1ff47c7f: Merge "Revert "Pack relocation tables for all dynamic executables""
* commit '893ed24dd7cec9b560fe46862b3635efa327ec65':
  Revert "Pack relocation tables for all dynamic executables"
2015-04-23 05:07:11 +00:00
Dimitry Ivanov
893ed24dd7 am 387a9fee: am 941d61de: am 1ff47c7f: Merge "Revert "Pack relocation tables for all dynamic executables""
* commit '387a9fee53ddb258c858d14cfd619109504a4366':
  Revert "Pack relocation tables for all dynamic executables"
2015-04-23 04:55:24 +00:00