Elliott Hughes
d9ac3e9ad6
am 97bcf915: Merge "Remove HAVE_PRINTF_ZD."
...
* commit '97bcf915ad005a4baeb981ed8da09ab219973b1f':
Remove HAVE_PRINTF_ZD.
2015-04-03 20:30:45 +00:00
Elliott Hughes
97bcf915ad
Merge "Remove HAVE_PRINTF_ZD."
2015-04-03 20:16:25 +00:00
Elliott Hughes
8a11491bc9
Remove HAVE_PRINTF_ZD.
...
Change-Id: Ie7677e4816ad886c13a8ac869e7c7342082a350f
2015-04-03 13:05:53 -07:00
Elliott Hughes
5d375b92fc
am dbaee628: Merge "Remove HAVE_STRLCPY."
...
* commit 'dbaee628ec6a8215b59db66dac86846e6481263a':
Remove HAVE_STRLCPY.
2015-04-03 19:48:11 +00:00
Elliott Hughes
dbaee628ec
Merge "Remove HAVE_STRLCPY."
2015-04-03 19:42:06 +00:00
Ying Wang
c35e790267
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.
2015-04-03 17:04:29 +00:00
Ying Wang
555b7770fe
Merge "Move the inclusion of depfile to where it's generated."
2015-04-03 16:55:44 +00:00
Ying Wang
cddece6f8f
Move the inclusion of depfile to where it's generated.
...
Change-Id: Ib7ed6d7d9105e49961ac467fd1d390060d4f5c38
2015-04-03 09:53:41 -07:00
Ying Wang
6fe4ab9487
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
2015-04-03 16:04:43 +00:00
Ying Wang
58912c874b
Merge "Don't fail build of otatools if there are no device certificates"
2015-04-03 15:57:57 +00:00
Ying Wang
20fa9a8e65
am 62003acd: Merge "Use PRIVATE_ALL_OBJECTS"
...
* commit '62003acdcc2ecdc13ce2a9880c35147d2070e865':
Use PRIVATE_ALL_OBJECTS
2015-04-03 01:11:22 +00:00
Ying Wang
62003acdcc
Merge "Use PRIVATE_ALL_OBJECTS"
2015-04-03 01:03:50 +00:00
Ying Wang
854607ec49
Use PRIVATE_ALL_OBJECTS
...
Instead of the dirty $(filter) call.
Change-Id: Idd3c9be570a00dc365a08e5b4ba1cb2e1f0ce005
2015-04-02 18:02:33 -07:00
Elliott Hughes
8f06d8afb8
Remove HAVE_STRLCPY.
...
Change-Id: I27864a9075183de5bd83569d53a00fc2f53c96df
2015-04-02 16:43:52 -07:00
Chih-Hung Hsieh
ead6162694
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.
2015-04-02 22:28:30 +00:00
Chih-Hung Hsieh
ced6159b7e
Merge "Filter out gcc flags that are not recognized by clang."
2015-04-02 22:16:17 +00:00
Chih-Hung Hsieh
9205bc1da6
Filter out gcc flags that are not recognized by clang.
...
Change-Id: I04e95fc3b0cb2825bf90a55916f89d25fa9fc475
2015-04-02 14:42:20 -07:00
Mark Salyzyn
496c4eb6a3
am 6ac0d474: Merge "fs_config: move fs_config to libcutils"
...
* commit '6ac0d47402855d199a1afd6bc5c7cd775a1cf5d1':
fs_config: move fs_config to libcutils
2015-04-02 21:09:41 +00:00
Mark Salyzyn
4743781769
am 62d7ccad: Merge "fs_get_stats: move fs_config to libcutils"
...
* commit '62d7ccad176ac1110a912d1cfe327e938c91bd59':
fs_get_stats: move fs_config to libcutils
2015-04-02 21:09:40 +00:00
Mark Salyzyn
6ac0d47402
Merge "fs_config: move fs_config to libcutils"
2015-04-02 21:02:52 +00:00
Mark Salyzyn
62d7ccad17
Merge "fs_get_stats: move fs_config to libcutils"
2015-04-02 21:00:05 +00:00
Mark Salyzyn
1c5f19eabe
fs_config: move fs_config to libcutils
...
Bug: 19908228
Change-Id: I4103ac395d0a28fd13173cc703e980aafe6c02e1
2015-04-02 13:56:00 -07:00
Mark Salyzyn
8efa6d3f0d
fs_get_stats: move fs_config to libcutils
...
Bug: 19908228
Change-Id: I668bf8e11b09ccc9c298382e54208f531844b0c5
2015-04-02 13:55:44 -07:00
Ying Wang
da885b90e4
am 71d4c95f: Merge "Fix typo."
...
* commit '71d4c95f83018199b8e79d0800dd2eca80b9f728':
Fix typo.
2015-04-02 19:57:49 +00:00
Ying Wang
71d4c95f83
Merge "Fix typo."
2015-04-02 19:49:13 +00:00
Ying Wang
36b039a2d6
Fix typo.
...
Change-Id: Ic934ed8610a4f03fbfb3d06dff4d911734a9d818
2015-04-02 12:48:32 -07:00
Mohamad Ayyash
347195da2e
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
2015-04-02 18:25:53 +00:00
Mohamad Ayyash
6ddc360065
Merge "build_image.py: Verity support for flashing non partition spanning fs"
2015-04-02 18:18:21 +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
Claes Elgemark
ed1158e01f
Don't fail build of otatools if there are no device certificates
...
Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
2015-04-02 17:38:29 +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
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
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
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
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
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
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
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
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