OSDN Git Service
Ying Wang [Mon, 13 Apr 2015 22:51:29 +0000 (22:51 +0000)]
am
414bb9a4: am
78622230: am
47ff7f56: Merge "Add host tool fastboot to every build."
* commit '
414bb9a4823c44e2f4927f052678e56935d3a9af':
Add host tool fastboot to every build.
Ying Wang [Mon, 13 Apr 2015 22:27:54 +0000 (22:27 +0000)]
am
78622230: am
47ff7f56: Merge "Add host tool fastboot to every build."
* commit '
7862223034dee3ef9ac35e3a5346a24c77eacd1b':
Add host tool fastboot to every build.
Ying Wang [Mon, 13 Apr 2015 22:17:14 +0000 (22:17 +0000)]
am
47ff7f56: Merge "Add host tool fastboot to every build."
* commit '
47ff7f56d67ca0b819a95f90d428db2e4fd3364e':
Add host tool fastboot to every build.
Ying Wang [Mon, 13 Apr 2015 22:07:40 +0000 (22:07 +0000)]
Merge "Add host tool fastboot to every build."
Ying Wang [Mon, 13 Apr 2015 21:49:19 +0000 (14:49 -0700)]
Add host tool fastboot to every build.
Some tools expect fastboot to be present even in user builds.
Change-Id: I4b6ee458eb2feb0dc7a77ec33a04219c5f4adc0d
David Srbecky [Mon, 13 Apr 2015 21:13:22 +0000 (21:13 +0000)]
am
ace60518: am
6bb41928: am
c8400a3e: Merge "Add --include-cfi compiler option."
* commit '
ace60518c3a19fae779b350795ac3d46d2833feb':
Add --include-cfi compiler option.
David Srbecky [Mon, 13 Apr 2015 20:51:53 +0000 (20:51 +0000)]
am
6bb41928: am
c8400a3e: Merge "Add --include-cfi compiler option."
* commit '
6bb41928e4fe2673a036a4bfa1625c5598cf14f1':
Add --include-cfi compiler option.
David Srbecky [Mon, 13 Apr 2015 20:45:04 +0000 (20:45 +0000)]
am
c8400a3e: Merge "Add --include-cfi compiler option."
* commit '
c8400a3e2fa2e647b74042f1f32bd83dbae255d4':
Add --include-cfi compiler option.
David Srbecky [Mon, 13 Apr 2015 20:34:49 +0000 (20:34 +0000)]
Merge "Add --include-cfi compiler option."
David Srbecky [Mon, 13 Apr 2015 18:50:51 +0000 (19:50 +0100)]
Add --include-cfi compiler option.
Decouple generation of CFI from the rest of debug symbols.
This makes it possible to generate oat with CFI but without
the rest of debug symbols.
This is in line with intention of the .eh_frame section.
The section does not have the .debug_ prefix because it
is considered somewhat different to the rest of debug symbols.
Change-Id: I32816ecd4f30ac4e0dc69d69a4993e349c737f96
Ricardo Garcia [Mon, 13 Apr 2015 17:55:19 +0000 (17:55 +0000)]
Merge "Adding libsonic to base.mk"
Andrew Hsieh [Mon, 13 Apr 2015 03:38:35 +0000 (03:38 +0000)]
am
00b0f345: am
45c4c5af: am
7bd978c2: Merge "Enable linker -fix-cortex-a53-843419"
* commit '
00b0f345b62065979dbebb648e4d549953577ac3':
Enable linker -fix-cortex-a53-843419
Andrew Hsieh [Mon, 13 Apr 2015 03:16:51 +0000 (03:16 +0000)]
am
45c4c5af: am
7bd978c2: Merge "Enable linker -fix-cortex-a53-843419"
* commit '
45c4c5af9e226231167d374b27e30c6bf0e073ea':
Enable linker -fix-cortex-a53-843419
Andrew Hsieh [Mon, 13 Apr 2015 03:11:45 +0000 (03:11 +0000)]
am
7bd978c2: Merge "Enable linker -fix-cortex-a53-843419"
* commit '
7bd978c2b33c4c9ce2e75923a3eddc5643d03888':
Enable linker -fix-cortex-a53-843419
Andrew Hsieh [Mon, 13 Apr 2015 03:06:48 +0000 (03:06 +0000)]
Merge "Enable linker -fix-cortex-a53-843419"
David Friedman [Sat, 11 Apr 2015 03:31:43 +0000 (03:31 +0000)]
am
0a4bfe82: am
bc8bb112: am
f69594b1: am
cccdfc8a: Deleting or modifying files in new templates-ndk directory.
* commit '
0a4bfe82c3902a16adaca23746e4bee7d9f70cfa':
Deleting or modifying files in new templates-ndk directory.
David Friedman [Sat, 11 Apr 2015 03:11:26 +0000 (03:11 +0000)]
am
bc8bb112: am
f69594b1: am
cccdfc8a: Deleting or modifying files in new templates-ndk directory.
* commit '
bc8bb112edfd949fb44f7511d40e5afcc5a6ec14':
Deleting or modifying files in new templates-ndk directory.
David Friedman [Sat, 11 Apr 2015 03:02:27 +0000 (03:02 +0000)]
am
f69594b1: am
cccdfc8a: Deleting or modifying files in new templates-ndk directory.
* commit '
f69594b164da237d54288631ce457e6add636133':
Deleting or modifying files in new templates-ndk directory.
David Friedman [Sat, 11 Apr 2015 02:51:34 +0000 (02:51 +0000)]
am
cccdfc8a: Deleting or modifying files in new templates-ndk directory.
* commit '
cccdfc8a21134de2137e0f3cdc49bfc65601c944':
Deleting or modifying files in new templates-ndk directory.
David Friedman [Sat, 11 Apr 2015 02:12:07 +0000 (02:12 +0000)]
am
503363c6: am
21132c61: am
d5df2d94: am
53b7c759: Cloned templates-sdk to create baseline for templates-ndk
* commit '
503363c60d87be1cd816f582d823e57ddd2b149b':
Cloned templates-sdk to create baseline for templates-ndk
David Friedman [Sat, 11 Apr 2015 02:12:06 +0000 (02:12 +0000)]
am
7dc6d60b: am
b35ecf96: am
c005ee25: am
fd16d093: Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."
* commit '
7dc6d60b46184e307f87643fbb100350171f13dd':
Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."
David Friedman [Sat, 11 Apr 2015 01:56:29 +0000 (01:56 +0000)]
am
8441c1d4: am
3df0e226: am
188a2bab: am
84520abc: Cloned sdk-templates directory to create an ndk-templates directory for production use.
* commit '
8441c1d444ebb468d63fec6b7562e7399d32aea6':
Cloned sdk-templates directory to create an ndk-templates directory for production use.
David Friedman [Sat, 11 Apr 2015 01:50:57 +0000 (01:50 +0000)]
am
21132c61: am
d5df2d94: am
53b7c759: Cloned templates-sdk to create baseline for templates-ndk
* commit '
21132c6173753c94437dee0eb9e6c39638889009':
Cloned templates-sdk to create baseline for templates-ndk
David Friedman [Sat, 11 Apr 2015 01:50:56 +0000 (01:50 +0000)]
am
b35ecf96: am
c005ee25: am
fd16d093: Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."
* commit '
b35ecf96a37ac31d04032836fc09d4f2c85a7e64':
Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."
David Friedman [Sat, 11 Apr 2015 01:41:20 +0000 (01:41 +0000)]
am
d5df2d94: am
53b7c759: Cloned templates-sdk to create baseline for templates-ndk
* commit '
d5df2d949bb83b37f6cc7491a3b87dc4b29b7ff1':
Cloned templates-sdk to create baseline for templates-ndk
David Friedman [Sat, 11 Apr 2015 01:41:18 +0000 (01:41 +0000)]
am
c005ee25: am
fd16d093: Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."
* commit '
c005ee2518926c8f019048c9d6264061c2eb3994':
Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."
David Friedman [Sat, 11 Apr 2015 01:27:57 +0000 (18:27 -0700)]
Deleting or modifying files in new templates-ndk directory.
Change-Id: I0244cd55e2ae25c08672fdf546a386592156e681
David Friedman [Sat, 11 Apr 2015 01:34:51 +0000 (01:34 +0000)]
am
53b7c759: Cloned templates-sdk to create baseline for templates-ndk
* commit '
53b7c759ffaf80d87416a19ff2d3474e9fef52cb':
Cloned templates-sdk to create baseline for templates-ndk
David Friedman [Sat, 11 Apr 2015 01:34:50 +0000 (01:34 +0000)]
am
fd16d093: Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."
* commit '
fd16d0930a5a6a74dce77c9a2da5707a6078d3f1':
Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."
David Friedman [Sat, 11 Apr 2015 01:29:53 +0000 (01:29 +0000)]
am
3df0e226: am
188a2bab: am
84520abc: Cloned sdk-templates directory to create an ndk-templates directory for production use.
* commit '
3df0e2266584ad73ee2fc02e75051c1ae7ee480c':
Cloned sdk-templates directory to create an ndk-templates directory for production use.
David Friedman [Sat, 11 Apr 2015 01:20:05 +0000 (01:20 +0000)]
am
188a2bab: am
84520abc: Cloned sdk-templates directory to create an ndk-templates directory for production use.
* commit '
188a2bab026237eebe9a773dd8fc287eb9a714be':
Cloned sdk-templates directory to create an ndk-templates directory for production use.
David Friedman [Sat, 11 Apr 2015 01:19:45 +0000 (18:19 -0700)]
Cloned templates-sdk to create baseline for templates-ndk
Change-Id: I34f3eccc02fab99f43e01ae4e51c1027193acd9a
David Friedman [Sat, 11 Apr 2015 01:10:48 +0000 (01:10 +0000)]
am
84520abc: Cloned sdk-templates directory to create an ndk-templates directory for production use.
* commit '
84520abc75adda2e42e9e8d7365cfb41feca5268':
Cloned sdk-templates directory to create an ndk-templates directory for production use.
David Friedman [Sat, 11 Apr 2015 01:07:39 +0000 (01:07 +0000)]
Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."
This reverts commit
84520abc75adda2e42e9e8d7365cfb41feca5268.
Change-Id: Id0734d134e424f1a101362781171371566f2ad7f
David Friedman [Fri, 10 Apr 2015 23:46:14 +0000 (16:46 -0700)]
Cloned sdk-templates directory to create an ndk-templates directory for
production use.
Change-Id: Icf205892d98f5a58350d140b0b0c56d0dceea111
Ricardo Garcia [Fri, 10 Apr 2015 22:43:30 +0000 (15:43 -0700)]
Adding libsonic to base.mk
Adding Sonic library to base
bug:
19196501
Change-Id: Id39a3a2f843aadf2808a10d2017151461db2c9b2
Pirama Arumuga Nainar [Fri, 10 Apr 2015 21:58:51 +0000 (21:58 +0000)]
am
1a2fd2eb: am
05130993: am
dbecad05: Merge "Use -Wno-format-pedantic to disable overly aggressive format string warning."
* commit '
1a2fd2eb1ac5160feb020b65a030c9b2c66d5dfc':
Use -Wno-format-pedantic to disable overly aggressive format string warning.
Pirama Arumuga Nainar [Fri, 10 Apr 2015 21:38:40 +0000 (21:38 +0000)]
am
05130993: am
dbecad05: Merge "Use -Wno-format-pedantic to disable overly aggressive format string warning."
* commit '
05130993f4f5f76773022eee6f0f198816e63e91':
Use -Wno-format-pedantic to disable overly aggressive format string warning.
Pirama Arumuga Nainar [Fri, 10 Apr 2015 21:31:18 +0000 (21:31 +0000)]
am
dbecad05: Merge "Use -Wno-format-pedantic to disable overly aggressive format string warning."
* commit '
dbecad05a9a9272a844d8649a89b987eb560c875':
Use -Wno-format-pedantic to disable overly aggressive format string warning.
Pirama Arumuga Nainar [Fri, 10 Apr 2015 21:22:52 +0000 (21:22 +0000)]
Merge "Use -Wno-format-pedantic to disable overly aggressive format string warning."
Stephen Hines [Fri, 10 Apr 2015 16:58:20 +0000 (16:58 +0000)]
am
55acb92d: am
d263924f: am
69bd465b: Merge "Don\'t use -Wl,--fix-cortex-a8 for Cortex A7, A9, A15, Krait or Denver"
* commit '
55acb92d825f12469e855485b23bfcd5e2461978':
Don't use -Wl,--fix-cortex-a8 for Cortex A7, A9, A15, Krait or Denver
Stephen Hines [Fri, 10 Apr 2015 16:35:53 +0000 (16:35 +0000)]
am
d263924f: am
69bd465b: Merge "Don\'t use -Wl,--fix-cortex-a8 for Cortex A7, A9, A15, Krait or Denver"
* commit '
d263924fe4d1203e97787e123ddd951879945bdd':
Don't use -Wl,--fix-cortex-a8 for Cortex A7, A9, A15, Krait or Denver
Stephen Hines [Fri, 10 Apr 2015 16:26:32 +0000 (16:26 +0000)]
am
69bd465b: Merge "Don\'t use -Wl,--fix-cortex-a8 for Cortex A7, A9, A15, Krait or Denver"
* commit '
69bd465b6e14294ce0678e8a18d28eb55abbe2c7':
Don't use -Wl,--fix-cortex-a8 for Cortex A7, A9, A15, Krait or Denver
Stephen Hines [Fri, 10 Apr 2015 16:17:52 +0000 (16:17 +0000)]
Merge "Don't use -Wl,--fix-cortex-a8 for Cortex A7, A9, A15, Krait or Denver"
Stephen Hines [Fri, 10 Apr 2015 16:06:12 +0000 (09:06 -0700)]
Use -Wno-format-pedantic to disable overly aggressive format string warning.
Bug:
20148343
The latest clang warns on "%p" being used with non-void pointer types, which
would require a great deal of cleanup in several sub-projects.
Change-Id: I4175d5cf8709504455067c906a2eb8ccc8e25432
Andres Morales [Fri, 10 Apr 2015 14:46:04 +0000 (14:46 +0000)]
Merge "Add gatekeeperd to build"
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
Andrew Hsieh [Thu, 9 Apr 2015 04:37:36 +0000 (12:37 +0800)]
Enable linker -fix-cortex-a53-843419
Change-Id: Icb8a4ce4d5688847cfe536eba2139cdf7f6406f3
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
OSDN Git Service
