Neil Fuller
2ff6a3bbdf
Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"
2015-04-01 17:43:54 +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
Mohamad Ayyash
dd063528ed
build_image.py: Verity support for flashing non partition spanning fs
...
Change-Id: Ic5f7b256ed9a31e99ebaebdf8a8a19ba9adcced3
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-04-01 00:50:39 +00: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
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
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
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
ee8323b629
Fix bad merge.
...
Change-Id: Ifdb2a2999fe13f770c239f47330e8c2c44fdfdbe
2015-03-27 23:50:31 +00: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
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
8853f5181b
am 55adb5a3
: am 1b23b33d
: Merge "MKBOOTIMG override were missing in two places"
...
* commit '55adb5a380f801038c00b2e169d33b6da93dfacc':
MKBOOTIMG override were missing in two places
2015-03-27 16:59:35 +00:00
Ying Wang
55adb5a380
am 1b23b33d
: Merge "MKBOOTIMG override were missing in two places"
...
* commit '1b23b33d92f32626584153739308e9147d1541bd':
MKBOOTIMG override were missing in two places
2015-03-27 16:52:49 +00:00
Ying Wang
1b23b33d92
Merge "MKBOOTIMG override were missing in two places"
2015-03-27 16:47:15 +00:00
Bart Sears
c3868ae371
resolved conflicts for merge of 6d607ee7
to lmp-mr1-dev-plus-aosp
...
Change-Id: I0a49bf5492cd5c1b03cf8cddd219db326d586909
2015-03-26 18:03:17 -07:00
Ying Wang
1c10f07572
am abba8a91
: am fcf0b138
: am ad54a4da
: Add selinux and verity support to custom image generation.
...
* commit 'abba8a9117682f064dcc5c9ffb71fe38352a7918':
2015-03-27 00:52:58 +00:00
The Android Automerger
0376271da3
am c3196186
: (-s ours) am 91fbe4de
: "LKY80"
...
* commit 'c3196186383e9071753ef50108dbb1f3eb73ecce':
"LKY80"
2015-03-27 00:52:57 +00:00
Bart Sears
6d607ee7b0
am 1ded630d
: am 1c3bf5c3
: DO NOT MERGE - Bump version to 5.1.1
...
* commit '1ded630dec3ea9450c702d7250f0807af7c47cbb':
DO NOT MERGE - Bump version to 5.1.1
2015-03-27 00:43:41 +00:00
Ying Wang
abba8a9117
am fcf0b138
: am ad54a4da
: Add selinux and verity support to custom image generation.
...
* commit 'fcf0b1383999ce1da2ee9117884e31ca6620253b':
2015-03-27 00:43:40 +00:00