Commit Graph

6979 Commits

Author SHA1 Message Date
Andrew Hsieh 1849365e7b am 263e22d4: am 051f18f0: am f37e96e2: Merge "Revert "Enable linker -fix-cortex-a53-843419""
* commit '263e22d424a80de023143c4758e1e534c726a07d':
  Revert "Enable linker -fix-cortex-a53-843419"
2015-04-14 03:01:10 +00:00
Andrew Hsieh 263e22d424 am 051f18f0: am f37e96e2: Merge "Revert "Enable linker -fix-cortex-a53-843419""
* commit '051f18f0dce3d0e6278d5bd9b2aad03974549fb5':
  Revert "Enable linker -fix-cortex-a53-843419"
2015-04-14 00:08:51 +00:00
Andrew Hsieh f37e96e232 Merge "Revert "Enable linker -fix-cortex-a53-843419"" 2015-04-13 23:48:28 +00:00
Andrew Hsieh 32e1689684 Revert "Enable linker -fix-cortex-a53-843419"
This reverts commit 54b22a5a70.

Change-Id: I23613490030783fb6da678de5a25f37caebe5f97
2015-04-13 23:39:45 +00:00
David Srbecky b8b9fc72af am ace60518: am 6bb41928: am c8400a3e: Merge "Add --include-cfi compiler option."
* commit 'ace60518c3a19fae779b350795ac3d46d2833feb':
  Add --include-cfi compiler option.
2015-04-13 21:13:22 +00:00
David Srbecky ace60518c3 am 6bb41928: am c8400a3e: Merge "Add --include-cfi compiler option."
* commit '6bb41928e4fe2673a036a4bfa1625c5598cf14f1':
  Add --include-cfi compiler option.
2015-04-13 20:51:53 +00:00
David Srbecky c8400a3e2f Merge "Add --include-cfi compiler option." 2015-04-13 20:34:50 +00:00
David Srbecky 299d3f4960 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
2015-04-13 19:50:51 +01:00
Andrew Hsieh 93b8969085 am 00b0f345: am 45c4c5af: am 7bd978c2: Merge "Enable linker -fix-cortex-a53-843419"
* commit '00b0f345b62065979dbebb648e4d549953577ac3':
  Enable linker -fix-cortex-a53-843419
2015-04-13 03:38:35 +00:00
Andrew Hsieh 00b0f345b6 am 45c4c5af: am 7bd978c2: Merge "Enable linker -fix-cortex-a53-843419"
* commit '45c4c5af9e226231167d374b27e30c6bf0e073ea':
  Enable linker -fix-cortex-a53-843419
2015-04-13 03:16:51 +00:00
Andrew Hsieh 7bd978c2b3 Merge "Enable linker -fix-cortex-a53-843419" 2015-04-13 03:06:50 +00:00
Pirama Arumuga Nainar 30314ea5ff 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.
2015-04-10 21:58:51 +00: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 dbecad05a9 Merge "Use -Wno-format-pedantic to disable overly aggressive format string warning." 2015-04-10 21:23:12 +00:00
Stephen Hines 594dd525e6 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
2015-04-10 16:58:20 +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 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
Sami Tolvanen e18196095b Merge "Separate boot and recovery image signing from dm-verity" 2015-04-10 09:44:47 +00:00
Colin Cross 6afd8a897c 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"
2015-04-09 21:17:07 +00: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 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 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
Ying Wang 4972d195dd 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 09:45:39 -07:00
Yohann Roussel 597bdd70c1 Merge "Revert "Ignore ANDROID_JACK_VM_ARGS and ANDROID_JACK_EXTRA_ARGS"" 2015-04-09 11:44:56 +00:00
Yohann Roussel e163b4e2e8 Revert "Ignore ANDROID_JACK_VM_ARGS and ANDROID_JACK_EXTRA_ARGS"
This reverts commit d191667006.

Build server are no longer giving outdated options.

Change-Id: Idece7efc45bb42a39364f721a7e6a576705dc926
2015-04-09 10:10:21 +00:00
Andrew Hsieh 54b22a5a70 Enable linker -fix-cortex-a53-843419
Change-Id: Icb8a4ce4d5688847cfe536eba2139cdf7f6406f3
2015-04-09 12:37:36 +08:00
Tao Bao 65677cf0ee 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
2015-04-09 01:13:12 +00:00
Ying Wang c8a1553c3c am 58a7e3ac: am b78a6d7b: am 2594d3d1: Merge "Remove unnecessary confusing use of ."
* commit '58a7e3acacea8b458cac8d46edf084d7ddbf8ad3':
  Remove unnecessary confusing use of $(intermediate).
2015-04-09 01:13:10 +00:00
Nick Kralevich 8d36507971 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.
2015-04-09 01:13:07 +00:00
Ying Wang d9509e970c resolved conflicts for merge of 133415d5 to master
Change-Id: Iba6c1dd40e7a4c8058e7100f03296c8f72a2c949
2015-04-08 18:08:46 -07: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 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 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
Rom Lemarchand 324784ab85 Merge "Omit ramdisk from boot.img if building without ramdisk" 2015-04-08 22:27:03 +00:00
Rom Lemarchand f9c9266c75 Omit ramdisk from boot.img if building without ramdisk
Change-Id: I1940e3fd5f05dec555db04a556ed1fac58b2c15b
2015-04-08 15:11:47 -07: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
Ying Wang 8a0d53e7f5 Rename libnanopb-c-2.8.0 to libprotobuf-c-nano.
Bug: 20093047
Change-Id: I787925fde97d1a3965cb8a9bf012f3c5a45a6aed
2015-04-08 09:54:34 -07:00
Ying Wang e3b60664ea Merge "Consolidate the nanopb-c and regular protobuf build rules." 2015-04-08 16:22:17 +00:00
Sami Tolvanen 8b3f08bc7b 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
2015-04-08 12:30:16 +01:00