OSDN Git Service
Colin Cross [Thu, 9 Apr 2015 21:00:49 +0000 (21:00 +0000)]
am
c0a70d88: am
7c2bfaf3: Merge "Change the default multilib for host libraries to "both""
* commit '
c0a70d889f9c197cf927f697ee81a73910d62cfa':
Change the default multilib for host libraries to "both"
Colin Cross [Thu, 9 Apr 2015 20:55:01 +0000 (20:55 +0000)]
am
7c2bfaf3: Merge "Change the default multilib for host libraries to "both""
* commit '
7c2bfaf32959b3a9ebe5e59ac3734dfb36ca8bb0':
Change the default multilib for host libraries to "both"
Colin Cross [Thu, 9 Apr 2015 20:47:15 +0000 (20:47 +0000)]
Merge "Change the default multilib for host libraries to "both""
Ying Wang [Thu, 9 Apr 2015 17:26:41 +0000 (17:26 +0000)]
am
50010e96: am
42a3e879: Merge "Remove ancient ranlib workaround on Mac OS X."
* commit '
50010e96b68468692f5f110a04c40d66898131ab':
Remove ancient ranlib workaround on Mac OS X.
Ying Wang [Thu, 9 Apr 2015 17:16:44 +0000 (17:16 +0000)]
am
42a3e879: Merge "Remove ancient ranlib workaround on Mac OS X."
* commit '
42a3e879b63abeadf8fd09403ebb084a3ead887b':
Remove ancient ranlib workaround on Mac OS X.
Ying Wang [Thu, 9 Apr 2015 17:07:43 +0000 (17:07 +0000)]
Merge "Remove ancient ranlib workaround on Mac OS X."
Ying Wang [Thu, 9 Apr 2015 16:22:36 +0000 (09:22 -0700)]
Remove ancient ranlib workaround on Mac OS X.
Apparently we don't need it for Mac OS X 10.7 and above.
Change-Id: I5ee81700c16e8c66b2d5f2b373fd2d523b5ec018
Tao Bao [Thu, 9 Apr 2015 00:38:47 +0000 (00:38 +0000)]
am
083c1d7f: am
87df99f2: Merge "Fix the font size selection for recovery mode"
* commit '
083c1d7f7d0fad8ee071622caf15f02a1fcdd4b3':
Fix the font size selection for recovery mode
Ying Wang [Thu, 9 Apr 2015 00:38:45 +0000 (00:38 +0000)]
am
b78a6d7b: am
2594d3d1: Merge "Remove unnecessary confusing use of ."
* commit '
b78a6d7b2cc97431e666228eee5f82eec4e49be8':
Remove unnecessary confusing use of $(intermediate).
Nick Kralevich [Thu, 9 Apr 2015 00:31:57 +0000 (00:31 +0000)]
am
801411da: am
6d08a0d3: Merge "AndroidConfig.h: ensure HAVE_MALLOC_H always has a value."
* commit '
801411daca44a46338d8fa5e9015b85d94ecb471':
AndroidConfig.h: ensure HAVE_MALLOC_H always has a value.
Ying Wang [Thu, 9 Apr 2015 00:31:56 +0000 (00:31 +0000)]
am
4acabe0f: resolved conflicts for merge of
f5b9830b to stage-aosp-master
* commit '
4acabe0fd8778aad079ed4b3a9bbe011db12ece3':
Better way to package up the otatools-package.
Tao Bao [Thu, 9 Apr 2015 00:31:32 +0000 (00:31 +0000)]
am
87df99f2: Merge "Fix the font size selection for recovery mode"
* commit '
87df99f2f644802933cf937f19fe0ca269770e5f':
Fix the font size selection for recovery mode
Ying Wang [Thu, 9 Apr 2015 00:31:30 +0000 (00:31 +0000)]
am
2594d3d1: Merge "Remove unnecessary confusing use of ."
* commit '
2594d3d1214642a8da8cdff01562ec205b02935a':
Remove unnecessary confusing use of $(intermediate).
Tao Bao [Wed, 8 Apr 2015 23:55:28 +0000 (23:55 +0000)]
Merge "Fix the font size selection for recovery mode"
Ying Wang [Wed, 8 Apr 2015 23:40:34 +0000 (23:40 +0000)]
Merge "Remove unnecessary confusing use of $(intermediate)."
Ying Wang [Wed, 8 Apr 2015 23:37:34 +0000 (16:37 -0700)]
Remove unnecessary confusing use of $(intermediate).
Change-Id: I0e73c3c1bf94540419e1fd227a3096da148e2459
Nick Kralevich [Wed, 8 Apr 2015 23:27:14 +0000 (23:27 +0000)]
am
6d08a0d3: Merge "AndroidConfig.h: ensure HAVE_MALLOC_H always has a value."
* commit '
6d08a0d3fc108f80db47541b0ecbb89e99a99260':
AndroidConfig.h: ensure HAVE_MALLOC_H always has a value.
Ying Wang [Wed, 8 Apr 2015 23:21:58 +0000 (16:21 -0700)]
resolved conflicts for merge of
f5b9830b to stage-aosp-master
Change-Id: I2eaab6ce59ee2dd89b89259f409bfff6180c89d3
Nick Kralevich [Wed, 8 Apr 2015 22:50:03 +0000 (22:50 +0000)]
Merge "AndroidConfig.h: ensure HAVE_MALLOC_H always has a value."
Tao Bao [Wed, 8 Apr 2015 21:14:43 +0000 (14:14 -0700)]
Fix the font size selection for recovery mode
shamu has a 560dpi density, which is between xxhdpi and xxxhdpi. It
deserves the large font (18x32), otherwise it falls back to use the
small one and makes it mostly unreadable under recovery mode. Amend
the list to include 560dpi and 400dpi that are higher than xhdpi.
Ideally we should map string formats back to numbers for easy
comparison (and to handle any high but odd density values).
Change-Id: Ie08d9ce5e1c8850ff30a79bcbfd1b89e971b7e07
Ying Wang [Wed, 8 Apr 2015 20:53:45 +0000 (20:53 +0000)]
Merge "Better way to package up the otatools-package."
Ying Wang [Wed, 8 Apr 2015 19:24:37 +0000 (12:24 -0700)]
Better way to package up the otatools-package.
With this, you can easily add more executables, jars or shared libraries
to the package. Also now it automatically takes care of
32-bit-v.s.-64-bit library issue.
Change-Id: I5afe00fadc978d0da229b192eca1a4b1c149764e
Nick Kralevich [Wed, 8 Apr 2015 19:21:54 +0000 (12:21 -0700)]
AndroidConfig.h: ensure HAVE_MALLOC_H always has a value.
Some programs (cough sqlite cough) do an improper check to see if
HAVE_MALLOC_H is defined. Instead of defining it with no value,
define it with a value so those checks pass.
Needed for bug:
20099586
Change-Id: I4c293b2c1b5f4caad85ffc1fc34ac385bab23f5c
Colin Cross [Tue, 7 Apr 2015 22:11:37 +0000 (15:11 -0700)]
Change the default multilib for host libraries to "both"
Change host library builds to build for both architectures to
match device builds, removing the need for LOCAL_MULTILIB := both
in all the art library makefiles.
Change-Id: I2689f67c66f5055f93941f40b3e825127f693eca
Mark Salyzyn [Tue, 7 Apr 2015 16:58:02 +0000 (16:58 +0000)]
am
bf2474fb: am
011a50e4: Merge changes I75d472ed,I6d681071
* commit '
bf2474fba4dc446b4b580f4122d172e011c24ba1':
fs_get_stats: add logging
fs_config: add logging
Mark Salyzyn [Tue, 7 Apr 2015 16:47:54 +0000 (16:47 +0000)]
am
011a50e4: Merge changes I75d472ed,I6d681071
* commit '
011a50e4e1cc7371d8fbd0ea08002241fe54a675':
fs_get_stats: add logging
fs_config: add logging
Mark Salyzyn [Tue, 7 Apr 2015 16:40:05 +0000 (16:40 +0000)]
Merge changes I75d472ed,I6d681071
* changes:
fs_get_stats: add logging
fs_config: add logging
Mark Salyzyn [Tue, 7 Apr 2015 16:19:27 +0000 (09:19 -0700)]
fs_get_stats: add logging
libcutils fs_config has the right to add Android logging
Bug:
19908228
Change-Id: I75d472ed142e32959cec78bf7babbf39d2b66cd2
Mark Salyzyn [Tue, 7 Apr 2015 16:18:30 +0000 (09:18 -0700)]
fs_config: add logging
libcutils fs_config has the right to add Android logging
Bug:
19908228
Change-Id: I6d68107156962a6fec357ab99d23960c6852b026
Ying Wang [Sat, 4 Apr 2015 21:20:52 +0000 (21:20 +0000)]
am
f994458b: am
b4b996a8: Merge "Include vendorsetup scripts in order"
* commit '
f994458babc78670263085b027bfaa34ff0bc52a':
Include vendorsetup scripts in order
Ying Wang [Sat, 4 Apr 2015 21:10:43 +0000 (21:10 +0000)]
am
b4b996a8: Merge "Include vendorsetup scripts in order"
* commit '
b4b996a8ee26553e29f7610f97041753ddff3e68':
Include vendorsetup scripts in order
Ying Wang [Sat, 4 Apr 2015 21:03:32 +0000 (21:03 +0000)]
Merge "Include vendorsetup scripts in order"
Ying Wang [Sat, 4 Apr 2015 01:29:29 +0000 (01:29 +0000)]
am
aacc8bb4: am
18ecae31: Merge "Convert bc depfiles to .P files."
* commit '
aacc8bb4efb993e1d5ae539aa154c60d84a926dc':
Convert bc depfiles to .P files.
Ying Wang [Sat, 4 Apr 2015 01:19:52 +0000 (01:19 +0000)]
am
18ecae31: Merge "Convert bc depfiles to .P files."
* commit '
18ecae31e62365d658406ff33a93358beeb87553':
Convert bc depfiles to .P files.
Ying Wang [Sat, 4 Apr 2015 01:09:55 +0000 (01:09 +0000)]
Merge "Convert bc depfiles to .P files."
Ying Wang [Fri, 3 Apr 2015 23:15:28 +0000 (16:15 -0700)]
Convert bc depfiles to .P files.
So you don't need clean step when a header file gets moved or deleted.
Change-Id: Iec0d63b89ba17c4ef0ad75f4a52b6759f2bff58a
Elliott Hughes [Fri, 3 Apr 2015 22:23:06 +0000 (22:23 +0000)]
am
7616909b: am
519751a8: Merge "There\'s no such thing as _THREAD_SAFE."
* commit '
7616909b5e24289eb7caecb4708f0c69a09a26f9':
There's no such thing as _THREAD_SAFE.
Elliott Hughes [Fri, 3 Apr 2015 22:05:32 +0000 (22:05 +0000)]
am
519751a8: Merge "There\'s no such thing as _THREAD_SAFE."
* commit '
519751a88217e6fdc3b86979ffaf61ff03d92312':
There's no such thing as _THREAD_SAFE.
Elliott Hughes [Fri, 3 Apr 2015 21:55:06 +0000 (21:55 +0000)]
Merge "There's no such thing as _THREAD_SAFE."
Elliott Hughes [Fri, 3 Apr 2015 20:41:10 +0000 (13:41 -0700)]
There's no such thing as _THREAD_SAFE.
At least, as far as I can tell from the internet and from grep in /usr/include
on a Mac.
Change-Id: I7f39bb2013db88e59f604e4491344d0d342e5f0b
Elliott Hughes [Fri, 3 Apr 2015 20:40:54 +0000 (20:40 +0000)]
am
d9ac3e9a: am
97bcf915: Merge "Remove HAVE_PRINTF_ZD."
* commit '
d9ac3e9ad6079cf402e5c6895d54e0b3e3e2c455':
Remove HAVE_PRINTF_ZD.
Elliott Hughes [Fri, 3 Apr 2015 20:30:45 +0000 (20:30 +0000)]
am
97bcf915: Merge "Remove HAVE_PRINTF_ZD."
* commit '
97bcf915ad005a4baeb981ed8da09ab219973b1f':
Remove HAVE_PRINTF_ZD.
Elliott Hughes [Fri, 3 Apr 2015 20:16:21 +0000 (20:16 +0000)]
Merge "Remove HAVE_PRINTF_ZD."
Elliott Hughes [Fri, 3 Apr 2015 20:05:53 +0000 (13:05 -0700)]
Remove HAVE_PRINTF_ZD.
Change-Id: Ie7677e4816ad886c13a8ac869e7c7342082a350f
Elliott Hughes [Fri, 3 Apr 2015 19:59:00 +0000 (19:59 +0000)]
am
5d375b92: am
dbaee628: Merge "Remove HAVE_STRLCPY."
* commit '
5d375b92fcedd9db052eb0ed3834361002e7699f':
Remove HAVE_STRLCPY.
Elliott Hughes [Fri, 3 Apr 2015 19:48:11 +0000 (19:48 +0000)]
am
dbaee628: Merge "Remove HAVE_STRLCPY."
* commit '
dbaee628ec6a8215b59db66dac86846e6481263a':
Remove HAVE_STRLCPY.
Elliott Hughes [Fri, 3 Apr 2015 19:42:05 +0000 (19:42 +0000)]
Merge "Remove HAVE_STRLCPY."
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"
Oleksiy Avramchenko [Mon, 6 Oct 2014 16:51:58 +0000 (18:51 +0200)]
Include vendorsetup scripts in order
This fixes randomness of the combo index.
Change-Id: I533161fea8d1bc0c9dbd6ca2f3393d27310c9588
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
Elliott Hughes [Thu, 2 Apr 2015 23:43:52 +0000 (16:43 -0700)]
Remove HAVE_STRLCPY.
Change-Id: I27864a9075183de5bd83569d53a00fc2f53c96df
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
OSDN Git Service
