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
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
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
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
Ying Wang
383cc39285
am 62086971: am d64b853a: Merge "Bump generic_mips64 system partition size."
...
* commit '62086971c0616c325fd80ef172de1478ade52fbc':
Bump generic_mips64 system partition size.
2015-03-31 00:19:24 +00:00
Ying Wang
62086971c0
am d64b853a: Merge "Bump generic_mips64 system partition size."
...
* commit 'd64b853a6d45d11e1f892ad02c0a653e1b5b8663':
Bump generic_mips64 system partition size.
2015-03-31 00:13:39 +00:00
Ying Wang
d64b853a6d
Merge "Bump generic_mips64 system partition size."
2015-03-31 00:09:07 +00:00
Duane Sand
e53cf413e1
Bump generic_mips64 system partition size.
...
Fix broken mips64 build via 20% increase.
Change-Id: Ie30418c6fc7cf8810139abe53537ef8259a49a2f
2015-03-30 17:02:00 -07:00
Dan Albert
3d4466f3d6
am 146366bf: am b6339d74: am f1a8c8c5: Merge "Fix up a few callers of GetTypeAndDevice."
...
* commit '146366bfb28e6f7c7b785188325fab40c4db000a':
Fix up a few callers of GetTypeAndDevice.
2015-03-28 02:38:22 +00:00
Dan Albert
146366bfb2
am b6339d74: am f1a8c8c5: Merge "Fix up a few callers of GetTypeAndDevice."
...
* commit 'b6339d74fe575aa9e824ebb593c3064555a7af28':
Fix up a few callers of GetTypeAndDevice.
2015-03-28 02:24:39 +00:00
Dan Albert
b6339d74fe
am f1a8c8c5: Merge "Fix up a few callers of GetTypeAndDevice."
...
* commit 'f1a8c8c5de090221615bf1934e82e1fa9afc54b0':
Fix up a few callers of GetTypeAndDevice.
2015-03-28 02:20:24 +00:00
Dan Albert
f1a8c8c5de
Merge "Fix up a few callers of GetTypeAndDevice."
2015-03-28 02:15:43 +00:00
Dan Albert
ebb19aa01a
Fix up a few callers of GetTypeAndDevice.
...
Change-Id: I8f2d8d28b60715f917e9aceb8f851ad652034aa7
2015-03-27 19:11:53 -07:00
Dan Albert
f9aa358b4b
am ee8323b6: Fix bad merge.
...
* commit 'ee8323b6297c9e0e27524805c53d0eb3b271bc93':
Fix bad merge.
2015-03-28 00:02:13 +00:00
Dan Albert
ee8323b629
Fix bad merge.
...
Change-Id: Ifdb2a2999fe13f770c239f47330e8c2c44fdfdbe
2015-03-27 23:50:31 +00:00
Chih-hung Hsieh
cdac639599
am 29b415aa: am 1e9b11f4: am d63c78e0: Merge "Allow -mcpu=cortex-a15 for clang"
...
* commit '29b415aa7781b27fc4948307acc5961cd702dac2':
Allow -mcpu=cortex-a15 for clang
2015-03-27 23:49:27 +00:00
Dan Albert
cd9ecc0258
resolved conflicts for merge of eecf00db
to master
...
Change-Id: I7f268122c10152aff8ef59622edbba88db427fca
2015-03-27 16:37:23 -07:00
Chih-hung Hsieh
29b415aa77
am 1e9b11f4: am d63c78e0: Merge "Allow -mcpu=cortex-a15 for clang"
...
* commit '1e9b11f4b15982896a85cc70c25f6632395b4e29':
Allow -mcpu=cortex-a15 for clang
2015-03-27 23:26:15 +00:00
Ying Wang
8b6350cb88
am f6dfd7b6: am ddc5a8f7: am 8ffec13d: Merge "Add back Java resources to apk without Java code."
...
* commit 'f6dfd7b608f4e53b83dcb0713447f3040a0790f2':
Add back Java resources to apk without Java code.
2015-03-27 23:18:13 +00:00
Chih-hung Hsieh
1e9b11f4b1
am d63c78e0: Merge "Allow -mcpu=cortex-a15 for clang"
...
* commit 'd63c78e058da1418db133f62df4ace6f8109965b':
Allow -mcpu=cortex-a15 for clang
2015-03-27 23:17:43 +00:00
Chih-hung Hsieh
d63c78e058
Merge "Allow -mcpu=cortex-a15 for clang"
2015-03-27 22:33:04 +00:00
Dan Albert
eecf00db59
resolved conflicts for merge of 4c32aa3d
to lmp-mr1-dev-plus-aosp
...
Change-Id: I32a06c88416e68ce628f642e0d025d1df5e227d7
2015-03-27 14:37:14 -07:00
Ying Wang
f6dfd7b608
am ddc5a8f7: am 8ffec13d: Merge "Add back Java resources to apk without Java code."
...
* commit 'ddc5a8f78c1e5a180bb23878b4f47b68a91f8ed9':
Add back Java resources to apk without Java code.
2015-03-27 21:09:39 +00:00
Dan Albert
4c32aa3d0e
am 99e22a57: Merge "Make releasetools pylint clean."
...
* commit '99e22a57d0b186cb853d757a058318a8be78918b':
Make releasetools pylint clean.
2015-03-27 18:47:32 +00:00
Ying Wang
ddc5a8f78c
am 8ffec13d: Merge "Add back Java resources to apk without Java code."
...
* commit '8ffec13d9b3ea46a5aea1837c1184e67a908f1ef':
Add back Java resources to apk without Java code.
2015-03-27 18:47:31 +00:00
Dan Albert
99e22a57d0
Merge "Make releasetools pylint clean."
2015-03-27 18:40:02 +00:00
Ying Wang
8ffec13d9b
Merge "Add back Java resources to apk without Java code."
2015-03-27 18:32:00 +00:00
Ying Wang
454bcff255
Add back Java resources to apk without Java code.
...
With commit 33360dd569
we moved Java
resource packaging forward to creation of the jar file. But the Java
resource packaging will be skipped if a module has no Java code at all.
(The build system does support building an apk without Java code.)
In this change we add back the Java resources directly to the built apk
when the apk has no Java code.
(cherry-picked from commit 8b27d1879c
)
Bug: 19947218
Change-Id: I0e1a65a9cbe656974f8ef3923b2f15e9efa5feb9
2015-03-27 11:30:51 -07:00
Ying Wang
e01d2ab927
Merge "Add back Java resources to apk without Java code."
2015-03-27 18:17:12 +00:00