OSDN Git Service
Ying Wang [Fri, 3 Apr 2015 17:15:06 +0000 (17:15 +0000)]
am
c35e7902: am
555b7770: Merge "Move the inclusion of depfile to where it\'s generated."
* commit '
c35e7902679caf85d4295eca423b5df3dccaf79d':
Move the inclusion of depfile to where it's generated.
Ying Wang [Fri, 3 Apr 2015 17:04:29 +0000 (17:04 +0000)]
am
555b7770: Merge "Move the inclusion of depfile to where it\'s generated."
* commit '
555b7770fef6024ac6fe4e580f8a8d1663ceb001':
Move the inclusion of depfile to where it's generated.
Ying Wang [Fri, 3 Apr 2015 16:54:54 +0000 (16:54 +0000)]
Merge "Move the inclusion of depfile to where it's generated."
Ying Wang [Fri, 3 Apr 2015 16:53:41 +0000 (09:53 -0700)]
Move the inclusion of depfile to where it's generated.
Change-Id: Ib7ed6d7d9105e49961ac467fd1d390060d4f5c38
Ying Wang [Fri, 3 Apr 2015 16:14:37 +0000 (16:14 +0000)]
am
6fe4ab94: am
58912c87: Merge "Don\'t fail build of otatools if there are no device certificates"
* commit '
6fe4ab94878c7fd96ca41ac93c0684ba86e10a45':
Don't fail build of otatools if there are no device certificates
Ying Wang [Fri, 3 Apr 2015 16:04:43 +0000 (16:04 +0000)]
am
58912c87: Merge "Don\'t fail build of otatools if there are no device certificates"
* commit '
58912c874bff05e3e76ccc7b7907f628ed010bf5':
Don't fail build of otatools if there are no device certificates
Ying Wang [Fri, 3 Apr 2015 15:57:57 +0000 (15:57 +0000)]
Merge "Don't fail build of otatools if there are no device certificates"
Ying Wang [Fri, 3 Apr 2015 01:19:10 +0000 (01:19 +0000)]
am
20fa9a8e: am
62003acd: Merge "Use PRIVATE_ALL_OBJECTS"
* commit '
20fa9a8e65cd84cabc563f87839706d9f7308a8f':
Use PRIVATE_ALL_OBJECTS
Ying Wang [Fri, 3 Apr 2015 01:11:22 +0000 (01:11 +0000)]
am
62003acd: Merge "Use PRIVATE_ALL_OBJECTS"
* commit '
62003acdcc2ecdc13ce2a9880c35147d2070e865':
Use PRIVATE_ALL_OBJECTS
Ying Wang [Fri, 3 Apr 2015 01:03:50 +0000 (01:03 +0000)]
Merge "Use PRIVATE_ALL_OBJECTS"
Ying Wang [Fri, 3 Apr 2015 01:02:33 +0000 (18:02 -0700)]
Use PRIVATE_ALL_OBJECTS
Instead of the dirty $(filter) call.
Change-Id: Idd3c9be570a00dc365a08e5b4ba1cb2e1f0ce005
Chih-Hung Hsieh [Thu, 2 Apr 2015 22:35:34 +0000 (22:35 +0000)]
am
ead61626: am
ced6159b: Merge "Filter out gcc flags that are not recognized by clang."
* commit '
ead6162694de41e3fa611be1cd1d615b31c2919c':
Filter out gcc flags that are not recognized by clang.
Chih-Hung Hsieh [Thu, 2 Apr 2015 22:28:30 +0000 (22:28 +0000)]
am
ced6159b: Merge "Filter out gcc flags that are not recognized by clang."
* commit '
ced6159b7e5551fcd3f64c21b7807c7555f80f73':
Filter out gcc flags that are not recognized by clang.
Chih-Hung Hsieh [Thu, 2 Apr 2015 22:13:16 +0000 (22:13 +0000)]
Merge "Filter out gcc flags that are not recognized by clang."
Chih-Hung Hsieh [Thu, 2 Apr 2015 21:42:20 +0000 (14:42 -0700)]
Filter out gcc flags that are not recognized by clang.
Change-Id: I04e95fc3b0cb2825bf90a55916f89d25fa9fc475
Mark Salyzyn [Thu, 2 Apr 2015 21:21:45 +0000 (21:21 +0000)]
am
496c4eb6: am
6ac0d474: Merge "fs_config: move fs_config to libcutils"
* commit '
496c4eb6a3db26ce307eff2d9be090e1c85f8639':
fs_config: move fs_config to libcutils
Mark Salyzyn [Thu, 2 Apr 2015 21:21:44 +0000 (21:21 +0000)]
am
47437817: am
62d7ccad: Merge "fs_get_stats: move fs_config to libcutils"
* commit '
474378176900f93d2b460e7570a7944d7c196f52':
fs_get_stats: move fs_config to libcutils
Mark Salyzyn [Thu, 2 Apr 2015 21:09:41 +0000 (21:09 +0000)]
am
6ac0d474: Merge "fs_config: move fs_config to libcutils"
* commit '
6ac0d47402855d199a1afd6bc5c7cd775a1cf5d1':
fs_config: move fs_config to libcutils
Mark Salyzyn [Thu, 2 Apr 2015 21:09:40 +0000 (21:09 +0000)]
am
62d7ccad: Merge "fs_get_stats: move fs_config to libcutils"
* commit '
62d7ccad176ac1110a912d1cfe327e938c91bd59':
fs_get_stats: move fs_config to libcutils
Mark Salyzyn [Thu, 2 Apr 2015 21:02:52 +0000 (21:02 +0000)]
Merge "fs_config: move fs_config to libcutils"
Mark Salyzyn [Thu, 2 Apr 2015 21:00:05 +0000 (21:00 +0000)]
Merge "fs_get_stats: move fs_config to libcutils"
Mark Salyzyn [Wed, 1 Apr 2015 19:54:46 +0000 (12:54 -0700)]
fs_config: move fs_config to libcutils
Bug:
19908228
Change-Id: I4103ac395d0a28fd13173cc703e980aafe6c02e1
Mark Salyzyn [Wed, 1 Apr 2015 19:56:19 +0000 (12:56 -0700)]
fs_get_stats: move fs_config to libcutils
Bug:
19908228
Change-Id: I668bf8e11b09ccc9c298382e54208f531844b0c5
Ying Wang [Thu, 2 Apr 2015 20:07:52 +0000 (20:07 +0000)]
Ying Wang [Thu, 2 Apr 2015 19:57:49 +0000 (19:57 +0000)]
Ying Wang [Thu, 2 Apr 2015 19:49:13 +0000 (19:49 +0000)]
Merge "Fix typo."
Ying Wang [Thu, 2 Apr 2015 19:48:32 +0000 (12:48 -0700)]
Fix typo.
Change-Id: Ic934ed8610a4f03fbfb3d06dff4d911734a9d818
Mohamad Ayyash [Thu, 2 Apr 2015 18:37:05 +0000 (18:37 +0000)]
am
347195da: am
6ddc3600: Merge "build_image.py: Verity support for flashing non partition spanning fs"
* commit '
347195da2ea801db95cf201fa7516bf392dc005a':
build_image.py: Verity support for flashing non partition spanning fs
Mohamad Ayyash [Thu, 2 Apr 2015 18:25:53 +0000 (18:25 +0000)]
am
6ddc3600: Merge "build_image.py: Verity support for flashing non partition spanning fs"
* commit '
6ddc3600659d4517c416ce3b06e4ccee14042030':
build_image.py: Verity support for flashing non partition spanning fs
Dan Albert [Thu, 2 Apr 2015 18:25:35 +0000 (18:25 +0000)]
am
dc8d7092: am
0064c51e: Merge "Use prebuilt libclang_rt.profile."
* commit '
dc8d7092db0b2d5754931ae130da5b1790a7d670':
Use prebuilt libclang_rt.profile.
Mohamad Ayyash [Thu, 2 Apr 2015 18:18:21 +0000 (18:18 +0000)]
Merge "build_image.py: Verity support for flashing non partition spanning fs"
Dan Albert [Thu, 2 Apr 2015 18:14:48 +0000 (18:14 +0000)]
am
0064c51e: Merge "Use prebuilt libclang_rt.profile."
* commit '
0064c51efee452daae110eac99b1321c00652c17':
Use prebuilt libclang_rt.profile.
Dan Albert [Thu, 2 Apr 2015 18:05:20 +0000 (18:05 +0000)]
Merge "Use prebuilt libclang_rt.profile."
Claes Elgemark [Wed, 1 Apr 2015 09:29:29 +0000 (11:29 +0200)]
Don't fail build of otatools if there are no device certificates
Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
Dan Albert [Mon, 26 Jan 2015 00:20:57 +0000 (16:20 -0800)]
Use prebuilt libclang_rt.profile.
Bug:
17574078
Change-Id: I4838cd5d125a0b2bf76aad2fdaef1ee3122687e8
Ying Wang [Wed, 1 Apr 2015 22:51:49 +0000 (22:51 +0000)]
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.
Ying Wang [Wed, 1 Apr 2015 22:41:38 +0000 (22:41 +0000)]
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.
Ying Wang [Wed, 1 Apr 2015 22:31:15 +0000 (22:31 +0000)]
Merge "Return non-zero if can't locate top of the tree in m/mm/mmm."
Stephen Hines [Wed, 1 Apr 2015 19:09:58 +0000 (19:09 +0000)]
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.
Stephen Hines [Wed, 1 Apr 2015 18:59:07 +0000 (18:59 +0000)]
am
9a98c47c: Merge "Don\'t warn on definition of possibly reserved identifiers."
* commit '
9a98c47c64446e0c46f1d24f3d6526d177b62e14':
Don't warn on definition of possibly reserved identifiers.
Stephen Hines [Wed, 1 Apr 2015 18:50:28 +0000 (18:50 +0000)]
Merge "Don't warn on definition of possibly reserved identifiers."
Nick Kralevich [Wed, 1 Apr 2015 18:05:29 +0000 (18:05 +0000)]
am
4e94ed11: am
2d47488e: Merge "Drop BOARD_SEPOLICY_UNION."
* commit '
4e94ed11855e56ed498a2e7e83e312d5b691c5b9':
Drop BOARD_SEPOLICY_UNION.
Neil Fuller [Wed, 1 Apr 2015 18:05:28 +0000 (18:05 +0000)]
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
Nick Kralevich [Wed, 1 Apr 2015 17:54:46 +0000 (17:54 +0000)]
am
2d47488e: Merge "Drop BOARD_SEPOLICY_UNION."
* commit '
2d47488e675d0eb839ae6a7f9544cc64c50c68d2':
Drop BOARD_SEPOLICY_UNION.
Neil Fuller [Wed, 1 Apr 2015 17:54:44 +0000 (17:54 +0000)]
am
2ff6a3bb: Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"
* commit '
2ff6a3bbdf3a086e5e9a89e9acc66e8c5ae00539':
Add explicit dependency on tzdata_updates_intermediates for CTS
Nick Kralevich [Wed, 1 Apr 2015 17:47:10 +0000 (17:47 +0000)]
Merge "Drop BOARD_SEPOLICY_UNION."
Neil Fuller [Wed, 1 Apr 2015 17:43:54 +0000 (17:43 +0000)]
Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"
Ying Wang [Wed, 1 Apr 2015 17:13:02 +0000 (10:13 -0700)]
Return non-zero if can't locate top of the tree in m/mm/mmm.
Bug:
20017058
Change-Id: I85fac71061673d00a1b583ad13afc8567d794cd6
Tao Bao [Wed, 1 Apr 2015 17:15:29 +0000 (17:15 +0000)]
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
Tao Bao [Wed, 1 Apr 2015 17:05:36 +0000 (17:05 +0000)]
am
53602955: Merge "Add support to sign bootable images with vboot_signer"
* commit '
536029551d31d8084c444063349291781ee43ae1':
Add support to sign bootable images with vboot_signer
Neil Fuller [Wed, 1 Apr 2015 17:02:46 +0000 (18:02 +0100)]
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
Dan Albert [Wed, 1 Apr 2015 16:59:48 +0000 (16:59 +0000)]
am
071af0ac: am
b8765797: Merge "Add unwinder linking to STL setup."
* commit '
071af0ac49ab87e4d365056a8ff764177f56b428':
Add unwinder linking to STL setup.
Dan Albert [Wed, 1 Apr 2015 16:59:46 +0000 (16:59 +0000)]
am
0ea16fcc: am
60335c03: Merge "Revert "Revert "Fix the libgcc/libatomic link order."""
* commit '
0ea16fcca3383bda04e873032d7721324ec90c42':
Revert "Revert "Fix the libgcc/libatomic link order.""
Tao Bao [Wed, 1 Apr 2015 16:54:44 +0000 (16:54 +0000)]
Merge "Add support to sign bootable images with vboot_signer"
Dan Albert [Wed, 1 Apr 2015 16:49:11 +0000 (16:49 +0000)]
am
b8765797: Merge "Add unwinder linking to STL setup."
* commit '
b8765797a89eebc97e38afcb94a965d69a8663ef':
Add unwinder linking to STL setup.
Dan Albert [Wed, 1 Apr 2015 16:49:10 +0000 (16:49 +0000)]
am
60335c03: Merge "Revert "Revert "Fix the libgcc/libatomic link order."""
* commit '
60335c03d7e897267eb20e0b0a6c7c864fd08b43':
Revert "Revert "Fix the libgcc/libatomic link order.""
Jeff Arneson [Wed, 1 Apr 2015 16:47:13 +0000 (16:47 +0000)]
am
05b3468b: am
6c46e0bf: Show annotation documentation on class details
* commit '
05b3468b1ea68450e4dc348c8b33a7eb3b34e7cc':
Show annotation documentation on class details
Dan Albert [Wed, 1 Apr 2015 16:40:21 +0000 (16:40 +0000)]
Merge "Add unwinder linking to STL setup."
Dan Albert [Wed, 1 Apr 2015 16:40:08 +0000 (16:40 +0000)]
Merge "Revert "Revert "Fix the libgcc/libatomic link order."""
Jeff Arneson [Wed, 1 Apr 2015 16:33:27 +0000 (16:33 +0000)]
am
6c46e0bf: Show annotation documentation on class details
* commit '
6c46e0bfe42f5ddfc3aa8ece645b4b244ced3a48':
Show annotation documentation on class details
Tao Bao [Mon, 30 Mar 2015 06:07:41 +0000 (23:07 -0700)]
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)
Stephen Smalley [Wed, 1 Apr 2015 14:30:10 +0000 (10:30 -0400)]
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>
Dan Albert [Tue, 31 Mar 2015 22:18:17 +0000 (15:18 -0700)]
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
Mohamad Ayyash [Tue, 24 Mar 2015 19:42:03 +0000 (12:42 -0700)]
build_image.py: Verity support for flashing non partition spanning fs
Change-Id: Ic5f7b256ed9a31e99ebaebdf8a8a19ba9adcced3
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Dan Albert [Tue, 31 Mar 2015 22:21:30 +0000 (15:21 -0700)]
Revert "Revert "Fix the libgcc/libatomic link order.""
This reverts commit
e440c3c07b26258139156075f0a51a9ad92eef75.
Jeff Arneson [Fri, 27 Mar 2015 22:32:06 +0000 (15:32 -0700)]
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
Neil Fuller [Tue, 31 Mar 2015 09:31:59 +0000 (09:31 +0000)]
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
Neil Fuller [Tue, 31 Mar 2015 09:25:12 +0000 (09:25 +0000)]
am
3cc6a0f2: Merge "Addition of a CTS suite for tzdata update code"
* commit '
3cc6a0f22f285c3fd8fb7f0b6559dd24b43e6541':
Addition of a CTS suite for tzdata update code
Neil Fuller [Tue, 31 Mar 2015 08:30:50 +0000 (08:30 +0000)]
Merge "Addition of a CTS suite for tzdata update code"
Ying Wang [Tue, 31 Mar 2015 00:19:24 +0000 (00:19 +0000)]
am
62086971: am
d64b853a: Merge "Bump generic_mips64 system partition size."
* commit '
62086971c0616c325fd80ef172de1478ade52fbc':
Bump generic_mips64 system partition size.
Ying Wang [Tue, 31 Mar 2015 00:13:39 +0000 (00:13 +0000)]
am
d64b853a: Merge "Bump generic_mips64 system partition size."
* commit '
d64b853a6d45d11e1f892ad02c0a653e1b5b8663':
Bump generic_mips64 system partition size.
Ying Wang [Tue, 31 Mar 2015 00:09:06 +0000 (00:09 +0000)]
Merge "Bump generic_mips64 system partition size."
Duane Sand [Tue, 31 Mar 2015 00:02:00 +0000 (17:02 -0700)]
Bump generic_mips64 system partition size.
Fix broken mips64 build via 20% increase.
Change-Id: Ie30418c6fc7cf8810139abe53537ef8259a49a2f
Dan Albert [Sat, 28 Mar 2015 02:24:39 +0000 (02:24 +0000)]
am
b6339d74: am
f1a8c8c5: Merge "Fix up a few callers of GetTypeAndDevice."
* commit '
b6339d74fe575aa9e824ebb593c3064555a7af28':
Fix up a few callers of GetTypeAndDevice.
Dan Albert [Sat, 28 Mar 2015 02:20:24 +0000 (02:20 +0000)]
am
f1a8c8c5: Merge "Fix up a few callers of GetTypeAndDevice."
* commit '
f1a8c8c5de090221615bf1934e82e1fa9afc54b0':
Fix up a few callers of GetTypeAndDevice.
Dan Albert [Sat, 28 Mar 2015 02:15:43 +0000 (02:15 +0000)]
Merge "Fix up a few callers of GetTypeAndDevice."
Dan Albert [Sat, 28 Mar 2015 02:11:53 +0000 (19:11 -0700)]
Fix up a few callers of GetTypeAndDevice.
Change-Id: I8f2d8d28b60715f917e9aceb8f851ad652034aa7
Dan Albert [Fri, 27 Mar 2015 23:49:01 +0000 (16:49 -0700)]
Fix bad merge.
Change-Id: Ifdb2a2999fe13f770c239f47330e8c2c44fdfdbe
Chih-hung Hsieh [Fri, 27 Mar 2015 23:26:15 +0000 (23:26 +0000)]
am
1e9b11f4: am
d63c78e0: Merge "Allow -mcpu=cortex-a15 for clang"
* commit '
1e9b11f4b15982896a85cc70c25f6632395b4e29':
Allow -mcpu=cortex-a15 for clang
Chih-hung Hsieh [Fri, 27 Mar 2015 23:17:43 +0000 (23:17 +0000)]
am
d63c78e0: Merge "Allow -mcpu=cortex-a15 for clang"
* commit '
d63c78e058da1418db133f62df4ace6f8109965b':
Allow -mcpu=cortex-a15 for clang
Chih-hung Hsieh [Fri, 27 Mar 2015 22:33:04 +0000 (22:33 +0000)]
Merge "Allow -mcpu=cortex-a15 for clang"
Dan Albert [Fri, 27 Mar 2015 21:28:51 +0000 (14:28 -0700)]
resolved conflicts for merge of
4c32aa3d to lmp-mr1-dev-plus-aosp
Change-Id: I32a06c88416e68ce628f642e0d025d1df5e227d7
Ying Wang [Fri, 27 Mar 2015 21:09:39 +0000 (21:09 +0000)]
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.
Dan Albert [Fri, 27 Mar 2015 18:47:32 +0000 (18:47 +0000)]
am
99e22a57: Merge "Make releasetools pylint clean."
* commit '
99e22a57d0b186cb853d757a058318a8be78918b':
Make releasetools pylint clean.
Ying Wang [Fri, 27 Mar 2015 18:47:31 +0000 (18:47 +0000)]
am
8ffec13d: Merge "Add back Java resources to apk without Java code."
* commit '
8ffec13d9b3ea46a5aea1837c1184e67a908f1ef':
Add back Java resources to apk without Java code.
Dan Albert [Fri, 27 Mar 2015 18:40:02 +0000 (18:40 +0000)]
Merge "Make releasetools pylint clean."
Ying Wang [Fri, 27 Mar 2015 18:32:00 +0000 (18:32 +0000)]
Merge "Add back Java resources to apk without Java code."
Ying Wang [Fri, 27 Mar 2015 18:07:17 +0000 (11:07 -0700)]
Add back Java resources to apk without Java code.
With commit
33360dd56925276e4526f5f52c26423e2bb1a670 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
8b27d1879c5692ebe6c5ac85383981fd96dfe2e1)
Bug:
19947218
Change-Id: I0e1a65a9cbe656974f8ef3923b2f15e9efa5feb9
Ying Wang [Fri, 27 Mar 2015 16:59:35 +0000 (16:59 +0000)]
am
55adb5a3: am
1b23b33d: Merge "MKBOOTIMG override were missing in two places"
* commit '
55adb5a380f801038c00b2e169d33b6da93dfacc':
MKBOOTIMG override were missing in two places
Ying Wang [Fri, 27 Mar 2015 16:52:49 +0000 (16:52 +0000)]
am
1b23b33d: Merge "MKBOOTIMG override were missing in two places"
* commit '
1b23b33d92f32626584153739308e9147d1541bd':
MKBOOTIMG override were missing in two places
Ying Wang [Fri, 27 Mar 2015 16:47:15 +0000 (16:47 +0000)]
Merge "MKBOOTIMG override were missing in two places"
Bart Sears [Fri, 27 Mar 2015 01:03:17 +0000 (18:03 -0700)]
resolved conflicts for merge of
6d607ee7 to lmp-mr1-dev-plus-aosp
Change-Id: I0a49bf5492cd5c1b03cf8cddd219db326d586909
Ying Wang [Fri, 27 Mar 2015 00:52:58 +0000 (00:52 +0000)]
am
abba8a91: am
fcf0b138: am
ad54a4da: Add selinux and verity support to custom image generation.
* commit '
abba8a9117682f064dcc5c9ffb71fe38352a7918':
The Android Automerger [Fri, 27 Mar 2015 00:52:57 +0000 (00:52 +0000)]
Bart Sears [Fri, 27 Mar 2015 00:43:41 +0000 (00:43 +0000)]
am
1ded630d: am
1c3bf5c3: DO NOT MERGE - Bump version to 5.1.1
* commit '
1ded630dec3ea9450c702d7250f0807af7c47cbb':
DO NOT MERGE - Bump version to 5.1.1
Ying Wang [Fri, 27 Mar 2015 00:43:40 +0000 (00:43 +0000)]
am
fcf0b138: am
ad54a4da: Add selinux and verity support to custom image generation.
* commit '
fcf0b1383999ce1da2ee9117884e31ca6620253b':
Bart Sears [Fri, 27 Mar 2015 00:35:28 +0000 (00:35 +0000)]
am
1c3bf5c3: DO NOT MERGE - Bump version to 5.1.1
* commit '
1c3bf5c39d281be4b437bc1a367c49b72c6e10b9':
DO NOT MERGE - Bump version to 5.1.1
Ying Wang [Fri, 27 Mar 2015 00:33:25 +0000 (00:33 +0000)]
am
ad54a4da: Add selinux and verity support to custom image generation.
* commit '
ad54a4dab520d84f76c9ad6a83be92b5563de24e':
Add selinux and verity support to custom image generation.
Ying Wang [Thu, 26 Mar 2015 23:37:47 +0000 (23:37 +0000)]
am
bc9ade72: am
d5415dc7: Merge "Fix: exit code is 0 even when check-boot-jars.py fails"
* commit '
bc9ade722f2fe2d4dcc71931cdfd62661d822027':
Fix: exit code is 0 even when check-boot-jars.py fails
Ying Wang [Thu, 26 Mar 2015 23:30:42 +0000 (23:30 +0000)]
am
d5415dc7: Merge "Fix: exit code is 0 even when check-boot-jars.py fails"
* commit '
d5415dc778abffdf7a9abba52b093da7a20496be':
Fix: exit code is 0 even when check-boot-jars.py fails
OSDN Git Service
