David Friedman
7dc6d60b46
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."
2015-04-11 01:50:56 +00:00
David Friedman
21132c6173
am d5df2d94: am 53b7c759: Cloned templates-sdk to create baseline for templates-ndk
...
* commit 'd5df2d949bb83b37f6cc7491a3b87dc4b29b7ff1':
Cloned templates-sdk to create baseline for templates-ndk
2015-04-11 01:41:20 +00:00
David Friedman
b35ecf96a3
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."
2015-04-11 01:41:18 +00:00
David Friedman
cccdfc8a21
Deleting or modifying files in new templates-ndk directory.
...
Change-Id: I0244cd55e2ae25c08672fdf546a386592156e681
2015-04-10 18:35:11 -07:00
David Friedman
d5df2d949b
am 53b7c759: Cloned templates-sdk to create baseline for templates-ndk
...
* commit '53b7c759ffaf80d87416a19ff2d3474e9fef52cb':
Cloned templates-sdk to create baseline for templates-ndk
2015-04-11 01:34:51 +00:00
David Friedman
c005ee2518
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."
2015-04-11 01:34:50 +00:00
David Friedman
8441c1d444
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.
2015-04-11 01:29:53 +00:00
David Friedman
3df0e22665
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.
2015-04-11 01:20:05 +00:00
David Friedman
53b7c759ff
Cloned templates-sdk to create baseline for templates-ndk
...
Change-Id: I34f3eccc02fab99f43e01ae4e51c1027193acd9a
2015-04-10 18:19:45 -07:00
David Friedman
188a2bab02
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.
2015-04-11 01:10:48 +00:00
David Friedman
fd16d0930a
Revert "Cloned sdk-templates directory to create an ndk-templates directory for production use."
...
This reverts commit 84520abc75
.
Change-Id: Id0734d134e424f1a101362781171371566f2ad7f
2015-04-11 01:07:39 +00:00
David Friedman
84520abc75
Cloned sdk-templates directory to create an ndk-templates directory for
...
production use.
Change-Id: Icf205892d98f5a58350d140b0b0c56d0dceea111
2015-04-10 17:48:12 -07:00
Pirama Arumuga Nainar
1a2fd2eb1a
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.
2015-04-10 21:38:40 +00:00
Pirama Arumuga Nainar
05130993f4
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.
2015-04-10 21:31:18 +00:00
Pirama Arumuga Nainar
dbecad05a9
Merge "Use -Wno-format-pedantic to disable overly aggressive format string warning."
2015-04-10 21:23:12 +00:00
Stephen Hines
55acb92d82
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
2015-04-10 16:35:53 +00:00
Stephen Hines
d263924fe4
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
2015-04-10 16:26:32 +00:00
Stephen Hines
69bd465b6e
Merge "Don't use -Wl,--fix-cortex-a8 for Cortex A7, A9, A15, Krait or Denver"
2015-04-10 16:17:52 +00:00
Stephen Hines
b992bfcf33
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
2015-04-10 09:12:38 -07:00
Tao Bao
948f67b0e7
am d0ca0549: am 8c76d1e0: Merge "Dump fingerprints into recovery log"
...
* commit 'd0ca05493bfe06cf166e4e215cd9bf38936fb344':
Dump fingerprints into recovery log
2015-04-10 02:23:31 +00:00
Tao Bao
d0ca05493b
am 8c76d1e0: Merge "Dump fingerprints into recovery log"
...
* commit '8c76d1e07a819b0a127ae0df533b627995cf49ff':
Dump fingerprints into recovery log
2015-04-10 02:12:59 +00:00
Tao Bao
8c76d1e07a
Merge "Dump fingerprints into recovery log"
2015-04-10 02:04:35 +00:00
Tao Bao
6c55a8adc8
Dump fingerprints into recovery log
...
No more guessing. We should have the info for OTA issues diagnosis.
Change-Id: I0ce919434444ab16a38cc7af818e64785509b0fb
2015-04-09 17:36:05 -07:00
Dan Albert
30a9c351d6
Use libcompiler_rt-extras on the host too.
...
Clang will sometimes generate this call (dex2oat with ubsan is one
known case), and it doesn't exist in libgcc.
Change-Id: I2eb68e2a326eb0407dca03b5870077eeebca1c0a
2015-04-09 16:38:55 -07:00
Colin Cross
9c3d43886e
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"
2015-04-09 21:00:49 +00:00
Colin Cross
c0a70d889f
am 7c2bfaf3: Merge "Change the default multilib for host libraries to "both""
...
* commit '7c2bfaf32959b3a9ebe5e59ac3734dfb36ca8bb0':
Change the default multilib for host libraries to "both"
2015-04-09 20:55:01 +00:00
Colin Cross
7c2bfaf329
Merge "Change the default multilib for host libraries to "both""
2015-04-09 20:47:16 +00:00
Ying Wang
1844a1ee28
am 50010e96: am 42a3e879: Merge "Remove ancient ranlib workaround on Mac OS X."
...
* commit '50010e96b68468692f5f110a04c40d66898131ab':
Remove ancient ranlib workaround on Mac OS X.
2015-04-09 17:26:41 +00:00
Ying Wang
50010e96b6
am 42a3e879: Merge "Remove ancient ranlib workaround on Mac OS X."
...
* commit '42a3e879b63abeadf8fd09403ebb084a3ead887b':
Remove ancient ranlib workaround on Mac OS X.
2015-04-09 17:16:44 +00:00
Ying Wang
42a3e879b6
Merge "Remove ancient ranlib workaround on Mac OS X."
2015-04-09 17:07:44 +00:00
Ying Wang
aaf9a5b0cc
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
2015-04-09 10:06:33 -07:00
Andrew Hsieh
54b22a5a70
Enable linker -fix-cortex-a53-843419
...
Change-Id: Icb8a4ce4d5688847cfe536eba2139cdf7f6406f3
2015-04-09 12:37:36 +08:00
Tao Bao
9e275b1d8b
am 083c1d7f: am 87df99f2: Merge "Fix the font size selection for recovery mode"
...
* commit '083c1d7f7d0fad8ee071622caf15f02a1fcdd4b3':
Fix the font size selection for recovery mode
2015-04-09 00:38:47 +00:00
Ying Wang
58a7e3acac
am b78a6d7b: am 2594d3d1: Merge "Remove unnecessary confusing use of ."
...
* commit 'b78a6d7b2cc97431e666228eee5f82eec4e49be8':
Remove unnecessary confusing use of $(intermediate).
2015-04-09 00:38:45 +00:00
Nick Kralevich
ac14f9710b
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.
2015-04-09 00:31:57 +00:00
Ying Wang
133415d551
am 4acabe0f: resolved conflicts for merge of f5b9830b
to stage-aosp-master
...
* commit '4acabe0fd8778aad079ed4b3a9bbe011db12ece3':
Better way to package up the otatools-package.
2015-04-09 00:31:56 +00:00
Tao Bao
083c1d7f7d
am 87df99f2: Merge "Fix the font size selection for recovery mode"
...
* commit '87df99f2f644802933cf937f19fe0ca269770e5f':
Fix the font size selection for recovery mode
2015-04-09 00:31:32 +00:00
Ying Wang
b78a6d7b2c
am 2594d3d1: Merge "Remove unnecessary confusing use of ."
...
* commit '2594d3d1214642a8da8cdff01562ec205b02935a':
Remove unnecessary confusing use of $(intermediate).
2015-04-09 00:31:30 +00:00
Tao Bao
87df99f2f6
Merge "Fix the font size selection for recovery mode"
2015-04-08 23:57:31 +00:00
Ying Wang
2594d3d121
Merge "Remove unnecessary confusing use of $(intermediate)."
2015-04-08 23:40:34 +00:00
Ying Wang
62925a993a
Remove unnecessary confusing use of $(intermediate).
...
Change-Id: I0e73c3c1bf94540419e1fd227a3096da148e2459
2015-04-08 16:37:34 -07:00
Nick Kralevich
801411daca
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.
2015-04-08 23:27:14 +00:00
Ying Wang
4acabe0fd8
resolved conflicts for merge of f5b9830b
to stage-aosp-master
...
Change-Id: I2eaab6ce59ee2dd89b89259f409bfff6180c89d3
2015-04-08 16:21:58 -07:00
Dan Albert
08cca28f92
Add support for ubsan.
...
Rather than adding LOCAL_UB_SANITIZER, LOCAL_THREAD_SANITIZER, etc for
each new sanitizer, deprecate LOCAL_ADDRESS_SANITIZER in favor of
LOCAL_SANITZE that mirrors the behavior of -fsanitize=<sanitizers>.
For example, the following will use both asan and ubsan:
LOCAL_SANITIZE := address undefined
We'll leave LOCAL_ADDRESS_SANITIZER around for compatibility until we
can clean up the tree.
Change-Id: I8a62315129d4753f8e992584ca6db1e5dfdd4d2a
2015-04-08 15:52:04 -07:00
Nick Kralevich
6d08a0d3fc
Merge "AndroidConfig.h: ensure HAVE_MALLOC_H always has a value."
2015-04-08 22:50:03 +00:00
Tao Bao
abbc911632
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
2015-04-08 15:39:33 -07:00
Ying Wang
f5b9830bc9
Merge "Better way to package up the otatools-package."
2015-04-08 20:53:45 +00:00
Ying Wang
c45a47b5f3
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
2015-04-08 12:40:37 -07:00
Nick Kralevich
9b44afb452
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
2015-04-08 12:21:54 -07:00
Colin Cross
9d59f41776
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
2015-04-08 18:09:52 +00:00