Commit graph

22556 commits

Author SHA1 Message Date
Dan Albert
57d71306a5 am 8f7338d9: am dc8d7092: am 0064c51e: Merge "Use prebuilt libclang_rt.profile."
* commit '8f7338d9b145379ea9c51b7e551509a2d8f0f24e':
  Use prebuilt libclang_rt.profile.
2015-04-02 18:49:26 +00:00
Dan Albert
8f7338d9b1 am dc8d7092: am 0064c51e: Merge "Use prebuilt libclang_rt.profile."
* commit 'dc8d7092db0b2d5754931ae130da5b1790a7d670':
  Use prebuilt libclang_rt.profile.
2015-04-02 18:25:35 +00:00
Dan Albert
dc8d7092db am 0064c51e: Merge "Use prebuilt libclang_rt.profile."
* commit '0064c51efee452daae110eac99b1321c00652c17':
  Use prebuilt libclang_rt.profile.
2015-04-02 18:14:48 +00:00
Dan Albert
0064c51efe Merge "Use prebuilt libclang_rt.profile." 2015-04-02 18:05:24 +00:00
Etan Cohen
c74a3b4cae Merge "Merge commit '597cfdb' into merge" 2015-04-02 03:11:00 +00:00
Dan Albert
343ed674e3 Use prebuilt libclang_rt.profile.
Bug: 17574078
Change-Id: I4838cd5d125a0b2bf76aad2fdaef1ee3122687e8
2015-04-01 19:03:22 -07:00
Ying Wang
131d2f15c8 am 8b6fabc4: am 18aad5fe: am 24a71e15: Merge "Return non-zero if can\'t locate top of the tree in m/mm/mmm."
* commit '8b6fabc4619f6b1c5c4c1834783268bea0e77afc':
  Return non-zero if can't locate top of the tree in m/mm/mmm.
2015-04-02 01:40:19 +00:00
Ying Wang
8b6fabc461 am 18aad5fe: am 24a71e15: Merge "Return non-zero if can\'t locate top of the tree in m/mm/mmm."
* commit '18aad5fea1c1cf651a518d73bfb43e13fcad0a40':
  Return non-zero if can't locate top of the tree in m/mm/mmm.
2015-04-01 22:51:49 +00:00
Ying Wang
18aad5fea1 am 24a71e15: Merge "Return non-zero if can\'t locate top of the tree in m/mm/mmm."
* commit '24a71e1565d48d6b5f9cdbd12e4cb279ae7e18bb':
  Return non-zero if can't locate top of the tree in m/mm/mmm.
2015-04-01 22:41:38 +00:00
Ying Wang
24a71e1565 Merge "Return non-zero if can't locate top of the tree in m/mm/mmm." 2015-04-01 22:31:16 +00:00
Stephen Hines
55ae50dc1d am 95212b90: am 31f35975: am 9a98c47c: Merge "Don\'t warn on definition of possibly reserved identifiers."
* commit '95212b900b7a9a205d6f8b79dc3fcc07576c18cd':
  Don't warn on definition of possibly reserved identifiers.
2015-04-01 22:09:03 +00:00
Nick Kralevich
ead02d1129 am 9160c60f: am 4e94ed11: am 2d47488e: Merge "Drop BOARD_SEPOLICY_UNION."
* commit '9160c60f136bafc9b8c07252e5814950eff33a20':
  Drop BOARD_SEPOLICY_UNION.
2015-04-01 19:13:31 +00:00
Neil Fuller
57df23e40a am 080d2f32: am 2e4c6762: am 2ff6a3bb: Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"
* commit '080d2f32add01c513913ec50acd9defee9cb7dfa':
  Add explicit dependency on tzdata_updates_intermediates for CTS
2015-04-01 19:13:29 +00:00
Stephen Hines
95212b900b am 31f35975: am 9a98c47c: Merge "Don\'t warn on definition of possibly reserved identifiers."
* commit '31f35975178e00c1178433bbbdefa0e27bee9750':
  Don't warn on definition of possibly reserved identifiers.
2015-04-01 19:09:58 +00:00
Stephen Hines
31f3597517 am 9a98c47c: Merge "Don\'t warn on definition of possibly reserved identifiers."
* commit '9a98c47c64446e0c46f1d24f3d6526d177b62e14':
  Don't warn on definition of possibly reserved identifiers.
2015-04-01 18:59:07 +00:00
Stephen Hines
9a98c47c64 Merge "Don't warn on definition of possibly reserved identifiers." 2015-04-01 18:50:29 +00:00
Nick Kralevich
9160c60f13 am 4e94ed11: am 2d47488e: Merge "Drop BOARD_SEPOLICY_UNION."
* commit '4e94ed11855e56ed498a2e7e83e312d5b691c5b9':
  Drop BOARD_SEPOLICY_UNION.
2015-04-01 18:05:29 +00:00
Neil Fuller
080d2f32ad am 2e4c6762: am 2ff6a3bb: Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"
* commit '2e4c67624c7f7d071d93d734cda024acea759582':
  Add explicit dependency on tzdata_updates_intermediates for CTS
2015-04-01 18:05:28 +00:00
Nick Kralevich
4e94ed1185 am 2d47488e: Merge "Drop BOARD_SEPOLICY_UNION."
* commit '2d47488e675d0eb839ae6a7f9544cc64c50c68d2':
  Drop BOARD_SEPOLICY_UNION.
2015-04-01 17:54:46 +00:00
Neil Fuller
2e4c67624c am 2ff6a3bb: Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"
* commit '2ff6a3bbdf3a086e5e9a89e9acc66e8c5ae00539':
  Add explicit dependency on tzdata_updates_intermediates for CTS
2015-04-01 17:54:44 +00:00
Nick Kralevich
2d47488e67 Merge "Drop BOARD_SEPOLICY_UNION." 2015-04-01 17:47:10 +00:00
Neil Fuller
2ff6a3bbdf Merge "Add explicit dependency on tzdata_updates_intermediates for CTS" 2015-04-01 17:43:54 +00:00
Tao Bao
521a8dbd18 am 93d46584: am ae26f5b0: am 53602955: Merge "Add support to sign bootable images with vboot_signer"
* commit '93d46584170a9aae1728cdb9010eef41e25b4d4a':
  Add support to sign bootable images with vboot_signer
2015-04-01 17:33:36 +00:00
Dan Albert
cb8436b78f am 320d9764: am 071af0ac: am b8765797: Merge "Add unwinder linking to STL setup."
* commit '320d976429f0f08b9954edca13930442f63300a8':
  Add unwinder linking to STL setup.
2015-04-01 17:27:34 +00:00
Dan Albert
7d1c9d312d am 8985a409: am 0ea16fcc: am 60335c03: Merge "Revert "Revert "Fix the libgcc/libatomic link order."""
* commit '8985a409b75e23dcadd0cb743a344876a95eb5d8':
  Revert "Revert "Fix the libgcc/libatomic link order.""
2015-04-01 17:27:32 +00:00
Jeff Arneson
a48eb45cb6 am e37f1eb7: am 05b3468b: am 6c46e0bf: Show annotation documentation on class details
* commit 'e37f1eb78e53261a6749229bbc7e1b3d8222067d':
  Show annotation documentation on class details
2015-04-01 17:27:13 +00:00
Ying Wang
0c1374cc70 Return non-zero if can't locate top of the tree in m/mm/mmm.
Bug: 20017058
Change-Id: I85fac71061673d00a1b583ad13afc8567d794cd6
2015-04-01 10:16:03 -07:00
Tao Bao
93d4658417 am ae26f5b0: am 53602955: Merge "Add support to sign bootable images with vboot_signer"
* commit 'ae26f5b002de956d495c4019b365040490ff18dd':
  Add support to sign bootable images with vboot_signer
2015-04-01 17:15:29 +00:00
Tao Bao
ae26f5b002 am 53602955: Merge "Add support to sign bootable images with vboot_signer"
* commit '536029551d31d8084c444063349291781ee43ae1':
  Add support to sign bootable images with vboot_signer
2015-04-01 17:05:36 +00:00
Neil Fuller
391d4e9c75 Add explicit dependency on tzdata_updates_intermediates for CTS
The build was working on AOSP, but fails downstream when using
Jack because the javalib.jar file needed by CTS is not being
built by default there.

Change-Id: I8dd836b33a4e1bae5af623db3822de99e9b05cf0
2015-04-01 18:02:46 +01:00
Dan Albert
320d976429 am 071af0ac: am b8765797: Merge "Add unwinder linking to STL setup."
* commit '071af0ac49ab87e4d365056a8ff764177f56b428':
  Add unwinder linking to STL setup.
2015-04-01 16:59:48 +00:00
Dan Albert
8985a409b7 am 0ea16fcc: am 60335c03: Merge "Revert "Revert "Fix the libgcc/libatomic link order."""
* commit '0ea16fcca3383bda04e873032d7721324ec90c42':
  Revert "Revert "Fix the libgcc/libatomic link order.""
2015-04-01 16:59:46 +00:00
Tao Bao
536029551d Merge "Add support to sign bootable images with vboot_signer" 2015-04-01 16:54:44 +00:00
Dan Albert
071af0ac49 am b8765797: Merge "Add unwinder linking to STL setup."
* commit 'b8765797a89eebc97e38afcb94a965d69a8663ef':
  Add unwinder linking to STL setup.
2015-04-01 16:49:11 +00:00
Dan Albert
0ea16fcca3 am 60335c03: Merge "Revert "Revert "Fix the libgcc/libatomic link order."""
* commit '60335c03d7e897267eb20e0b0a6c7c864fd08b43':
  Revert "Revert "Fix the libgcc/libatomic link order.""
2015-04-01 16:49:10 +00:00
Jeff Arneson
e37f1eb78e am 05b3468b: am 6c46e0bf: Show annotation documentation on class details
* commit '05b3468b1ea68450e4dc348c8b33a7eb3b34e7cc':
  Show annotation documentation on class details
2015-04-01 16:47:13 +00:00
Dan Albert
b8765797a8 Merge "Add unwinder linking to STL setup." 2015-04-01 16:40:21 +00:00
Dan Albert
60335c03d7 Merge "Revert "Revert "Fix the libgcc/libatomic link order.""" 2015-04-01 16:40:09 +00:00
Jeff Arneson
05b3468b1e am 6c46e0bf: Show annotation documentation on class details
* commit '6c46e0bfe42f5ddfc3aa8ece645b4b244ced3a48':
  Show annotation documentation on class details
2015-04-01 16:33:27 +00:00
Tao Bao
d95e9fd267 Add support to sign bootable images with vboot_signer
Add vboot properties to the dictionary file, which will be packed into
the target_files zip. Add support in packaging and OTA scripts to
sign the generated bootable images (boot.img and recovery.img) when
vboot is enabled.

Change-Id: I08758ced03d173219415bca762bbdb66c464a9f5
(cherry picked from commit 5d5a3bd9e8d8b14b71d1b2105417a2958d13d3d2)
2015-04-01 09:23:08 -07:00
Stephen Smalley
5699c6cf90 Drop BOARD_SEPOLICY_UNION.
As suggested in the comments on
https://android-review.googlesource.com/#/c/141560/
drop BOARD_SEPOLICY_UNION and simplify the build_policy logic.
Union all files found under BOARD_SEPOLICY_DIRS.

Change-Id: I4214893c999c23631f5456cb1b8edd59771ef13b
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-04-01 10:33:24 -04:00
Dan Albert
5036729c41 Add unwinder linking to STL setup.
Previously we were bundling this into libc++ and having each binary
resolve its symbols from there. This means that the unwinder that gets
used for a given binary is sensitive to the order in which its
libraries are linked. Making this a static library dependency of each
binary means the right unwinder will always be used.

Bug: 18471342
Bug: 19958712
Change-Id: I782d212784dbf85355b5d9146d7460d675259a0e
2015-03-31 18:29:23 -07:00
Dan Albert
91f713a168 Revert "Revert "Fix the libgcc/libatomic link order.""
This reverts commit e440c3c07b.
2015-03-31 16:42:52 -07:00
Jeff Arneson
6c46e0bfe4 Show annotation documentation on class details
Also fix a bug where showAnnotations tags weren't appearing on
symbols without a javadoc

Bug: 19427762
Bug: 19931569
Change-Id: I4de8d5682acc438da69637262d8447695d6fb975
2015-03-31 19:11:41 +00:00
Neil Fuller
e635e67252 am 0fd4a729: am 2f78e36d: am 3cc6a0f2: Merge "Addition of a CTS suite for tzdata update code"
* commit '0fd4a7293ec1d252fcd5ad74ab12d7782b0d92bf':
  Addition of a CTS suite for tzdata update code
2015-03-31 10:22:15 +00:00
Neil Fuller
0fd4a7293e am 2f78e36d: am 3cc6a0f2: Merge "Addition of a CTS suite for tzdata update code"
* commit '2f78e36ddee92938a9dddd0484781037b5b496eb':
  Addition of a CTS suite for tzdata update code
2015-03-31 09:31:59 +00:00
Neil Fuller
2f78e36dde am 3cc6a0f2: Merge "Addition of a CTS suite for tzdata update code"
* commit '3cc6a0f22f285c3fd8fb7f0b6559dd24b43e6541':
  Addition of a CTS suite for tzdata update code
2015-03-31 09:25:12 +00:00
Neil Fuller
3cc6a0f22f Merge "Addition of a CTS suite for tzdata update code" 2015-03-31 08:30:51 +00:00
Ying Wang
f7b5967781 am 383cc392: am 62086971: am d64b853a: Merge "Bump generic_mips64 system partition size."
* commit '383cc3928599311a0a8dedc067212d4baabcba1c':
  Bump generic_mips64 system partition size.
2015-03-31 00:50:59 +00:00
Fabrice Di Meglio
6696172bad Merge "Add IntentFilterVerifier to the build" 2015-03-31 00:20:12 +00:00