OSDN Git Service
Andres Morales [Fri, 10 Apr 2015 14:45:26 +0000 (14:45 +0000)]
Merge "Add GateKeeper to core build"
Sami Tolvanen [Fri, 10 Apr 2015 09:44:46 +0000 (09:44 +0000)]
Merge "Separate boot and recovery image signing from dm-verity"
Narayan Kamath [Fri, 10 Apr 2015 08:15:56 +0000 (08:15 +0000)]
Merge "Track renaming of org.apache.http.legacy.jar"
Tao Bao [Fri, 10 Apr 2015 04:35:11 +0000 (04:35 +0000)]
am
948f67b0: am
d0ca0549: am
8c76d1e0: Merge "Dump fingerprints into recovery log"
* commit '
948f67b0e7b3863488fd4a12a6797311d4c30508':
Dump fingerprints into recovery log
Tao Bao [Fri, 10 Apr 2015 02:23:31 +0000 (02:23 +0000)]
am
d0ca0549: am
8c76d1e0: Merge "Dump fingerprints into recovery log"
* commit '
d0ca05493bfe06cf166e4e215cd9bf38936fb344':
Dump fingerprints into recovery log
Tao Bao [Fri, 10 Apr 2015 02:12:59 +0000 (02:12 +0000)]
am
8c76d1e0: Merge "Dump fingerprints into recovery log"
* commit '
8c76d1e07a819b0a127ae0df533b627995cf49ff':
Dump fingerprints into recovery log
Tao Bao [Fri, 10 Apr 2015 02:04:35 +0000 (02:04 +0000)]
Merge "Dump fingerprints into recovery log"
Tao Bao [Wed, 8 Apr 2015 22:30:27 +0000 (15:30 -0700)]
Dump fingerprints into recovery log
No more guessing. We should have the info for OTA issues diagnosis.
Change-Id: I0ce919434444ab16a38cc7af818e64785509b0fb
Colin Cross [Thu, 9 Apr 2015 21:17:07 +0000 (21:17 +0000)]
am
9c3d4388: am
c0a70d88: am
7c2bfaf3: Merge "Change the default multilib for host libraries to "both""
* commit '
9c3d43886e4d788084767a790fc0c7528ca19d79':
Change the default multilib for host libraries to "both"
Mike Lockwood [Thu, 9 Apr 2015 21:05:09 +0000 (21:05 +0000)]
Merge "Add BluetoothMidiService to generic_no_telephony.mk"
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:47:21 +0000 (17:47 +0000)]
am
1844a1ee: am
50010e96: am
42a3e879: Merge "Remove ancient ranlib workaround on Mac OS X."
* commit '
1844a1ee28d69467a1cd5a7d03fd6f6a3616cd7b':
Remove ancient ranlib workaround on Mac OS X.
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
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
Narayan Kamath [Thu, 9 Apr 2015 12:12:09 +0000 (13:12 +0100)]
Track renaming of org.apache.http.legacy.jar
Change-Id: I224a4883474f81039df2203eb17272bc994c04c8
Yohann Roussel [Thu, 9 Apr 2015 11:44:56 +0000 (11:44 +0000)]
Merge "Revert "Ignore ANDROID_JACK_VM_ARGS and ANDROID_JACK_EXTRA_ARGS""
Yohann Roussel [Thu, 9 Apr 2015 10:10:21 +0000 (10:10 +0000)]
Revert "Ignore ANDROID_JACK_VM_ARGS and ANDROID_JACK_EXTRA_ARGS"
This reverts commit
d19166700666d7b84424187c0cdae67a9eb7659e.
Build server are no longer giving outdated options.
Change-Id: Idece7efc45bb42a39364f721a7e6a576705dc926
Roozbeh Pournader [Thu, 9 Apr 2015 02:12:52 +0000 (02:12 +0000)]
Merge "Add hyphenation patterns to generic_no_telephony.mk."
Tao Bao [Thu, 9 Apr 2015 01:13:12 +0000 (01:13 +0000)]
am
9e275b1d: am
083c1d7f: am
87df99f2: Merge "Fix the font size selection for recovery mode"
* commit '
9e275b1d8b1d729761dc2e873735ea0f14c29b11':
Fix the font size selection for recovery mode
Ying Wang [Thu, 9 Apr 2015 01:13:10 +0000 (01:13 +0000)]
am
58a7e3ac: am
b78a6d7b: am
2594d3d1: Merge "Remove unnecessary confusing use of ."
* commit '
58a7e3acacea8b458cac8d46edf084d7ddbf8ad3':
Remove unnecessary confusing use of $(intermediate).
Nick Kralevich [Thu, 9 Apr 2015 01:13:07 +0000 (01:13 +0000)]
am
ac14f971: am
801411da: am
6d08a0d3: Merge "AndroidConfig.h: ensure HAVE_MALLOC_H always has a value."
* commit '
ac14f9710b0c6405c19d2eff6f435c51dea1e4f5':
AndroidConfig.h: ensure HAVE_MALLOC_H always has a value.
Ying Wang [Thu, 9 Apr 2015 01:08:46 +0000 (18:08 -0700)]
resolved conflicts for merge of
133415d5 to master
Change-Id: Iba6c1dd40e7a4c8058e7100f03296c8f72a2c949
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
Rom Lemarchand [Wed, 8 Apr 2015 22:26:57 +0000 (22:26 +0000)]
Merge "Omit ramdisk from boot.img if building without ramdisk"
Rom Lemarchand [Wed, 8 Apr 2015 22:11:47 +0000 (15:11 -0700)]
Omit ramdisk from boot.img if building without ramdisk
Change-Id: I1940e3fd5f05dec555db04a556ed1fac58b2c15b
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
Joseph Wen [Wed, 8 Apr 2015 18:47:06 +0000 (18:47 +0000)]
Merge "Add StatementService to the build"
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
Ying Wang [Wed, 8 Apr 2015 16:54:34 +0000 (09:54 -0700)]
Rename libnanopb-c-2.8.0 to libprotobuf-c-nano.
Bug:
20093047
Change-Id: I787925fde97d1a3965cb8a9bf012f3c5a45a6aed
Ying Wang [Wed, 8 Apr 2015 16:22:17 +0000 (16:22 +0000)]
Merge "Consolidate the nanopb-c and regular protobuf build rules."
Joseph Wen [Wed, 25 Feb 2015 19:04:57 +0000 (14:04 -0500)]
Add StatementService to the build
- this is related to IntentFilter auto verification in Framework
Change-Id: I83d1c4bcc7be7992509348098cc320e38efea862
Yohann Roussel [Wed, 8 Apr 2015 13:20:45 +0000 (13:20 +0000)]
Merge changes from topic 'jack-server'
* changes:
Ignore ANDROID_JACK_VM_ARGS and ANDROID_JACK_EXTRA_ARGS
Don't call Jack directly, use the script instead
Sami Tolvanen [Tue, 7 Apr 2015 14:08:59 +0000 (15:08 +0100)]
Separate boot and recovery image signing from dm-verity
Allow dm-verity to be enabled without boot and recovery images being
signed. This makes it possible to enable only dm-verity to detect
corruption without confusing bootloaders that do not understand signed
images.
Bug:
19985143
Change-Id: Ie52c6ff595faa7a5c1f1bc1b37f6899c4d0c7001
Yohann Roussel [Tue, 7 Apr 2015 10:20:28 +0000 (12:20 +0200)]
Ignore ANDROID_JACK_VM_ARGS and ANDROID_JACK_EXTRA_ARGS
This is a temporrary workaround allowing to ignore outdated options
given by the build server that may cause OutOfMemoryError when
running Jack server.
Change-Id: I1b6b956de09faaeee1bf6a25c2a63124b69e2645
Yohann Roussel [Tue, 10 Mar 2015 15:50:55 +0000 (16:50 +0100)]
Don't call Jack directly, use the script instead
Change-Id: Ic9d4aa3cb543ab748423f4ea0d060544a4ea44e6
Ying Wang [Tue, 7 Apr 2015 18:59:34 +0000 (11:59 -0700)]
Consolidate the nanopb-c and regular protobuf build rules.
Bug:
20093047
Change-Id: I38ebd748aacce6d215403da481ad04833810a995
Mark Salyzyn [Tue, 7 Apr 2015 17:20:33 +0000 (17:20 +0000)]
am
e2925213: am
bf2474fb: am
011a50e4: Merge changes I75d472ed,I6d681071
* commit '
e2925213a73033451cd30dae620a0ce1abbc3a24':
fs_get_stats: add logging
fs_config: add logging
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
Roozbeh Pournader [Tue, 7 Apr 2015 16:13:21 +0000 (09:13 -0700)]
Add hyphenation patterns to generic_no_telephony.mk.
They should be included on all devices.
Bug:
20088132
Change-Id: I83bb2b018090bb9e76ea68ffad69f5e649d82be3
Andres Morales [Tue, 31 Mar 2015 23:31:13 +0000 (16:31 -0700)]
Add GateKeeper to core build
This is built from system/gatekeeper/softgatekeeper.
It will represent the core native library for
validating device Pin/Pattern/Password.
Change-Id: I927c17042e59076eb7867b8855c2970b1c289307
Roozbeh Pournader [Mon, 6 Apr 2015 19:43:04 +0000 (12:43 -0700)]
Remove Lohit fonts from the build.
There are no remaining fonts to be built from Lohit. They are all
replaced by Noto.
Change-Id: I694e48cec194735c176083e4f4b7491a1079f74c
Ying Wang [Sat, 4 Apr 2015 21:40:06 +0000 (21:40 +0000)]
am
0b584f2b: am
f994458b: am
b4b996a8: Merge "Include vendorsetup scripts in order"
* commit '
0b584f2b394051684e2506cc7304b583df29bca6':
Include vendorsetup scripts in order
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:49:47 +0000 (01:49 +0000)]
am
ea517854: am
aacc8bb4: am
18ecae31: Merge "Convert bc depfiles to .P files."
* commit '
ea5178545bf939fb65f77cd54eba9f274512638b':
Convert bc depfiles to .P files.
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.
Rom Lemarchand [Sat, 4 Apr 2015 01:13:44 +0000 (01:13 +0000)]
Merge "Add the new audio include path on the list of default includes"
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:44:06 +0000 (22:44 +0000)]
am
5432d355: am
7616909b: am
519751a8: Merge "There\'s no such thing as _THREAD_SAFE."
* commit '
5432d3551d70d0cd3abe4bfb47cb9276477a419a':
There's no such thing as _THREAD_SAFE.
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.
Rom Lemarchand [Fri, 3 Apr 2015 22:09:11 +0000 (15:09 -0700)]
Add the new audio include path on the list of default includes
Change-Id: If40ba57cb97f86802c2872772672a380afc4d947
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:58:27 +0000 (20:58 +0000)]
am
aa1bd146: am
d9ac3e9a: am
97bcf915: Merge "Remove HAVE_PRINTF_ZD."
* commit '
aa1bd1462dc019b6096e92e4888b577522139b52':
Remove HAVE_PRINTF_ZD.
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:24:24 +0000 (20:24 +0000)]
am
6f4befa0: am
5d375b92: am
dbaee628: Merge "Remove HAVE_STRLCPY."
* commit '
6f4befa0535749b55c5c5a859611fe855c26e369':
Remove HAVE_STRLCPY.
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:39:56 +0000 (17:39 +0000)]
am
a840faef: am
c35e7902: am
555b7770: Merge "Move the inclusion of depfile to where it\'s generated."
* commit '
a840faef517a196e235a197992e8feb9f13c27b7':
Move the inclusion of depfile to where it's generated.
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:07:37 +0000 (17:07 +0000)]
am
0216641e: am
6fe4ab94: am
58912c87: Merge "Don\'t fail build of otatools if there are no device certificates"
* commit '
0216641e04e3eae6f3b7d50108e632b249c15f1c':
Don't fail build of otatools if there are no device certificates
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 14:52:55 +0000 (14:52 +0000)]
am
5c11bd52: am
20fa9a8e: am
62003acd: Merge "Use PRIVATE_ALL_OBJECTS"
* commit '
5c11bd52db5d0887196895f321bf723ca1d206c7':
Use PRIVATE_ALL_OBJECTS
Elliott Hughes [Fri, 3 Apr 2015 14:43:46 +0000 (07:43 -0700)]
resolved conflicts for merge of
e04e91b1 to master
Change-Id: I537065b0810ea8525401778824c4810c5e7ef433
OSDN Git Service
