tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
23411 commits 1 branch 0 tags 119 MiB
Commit graph

7196 commits

Author SHA1 Message Date
Dmitriy Ivanov
4c2d1a64fb Pack relocation tables for dynamic executables 
Add replocation-packer step for dynmic executables.

  Enable it by default for arm and arm64 platforms.

Bug: http://b/18051137
Change-Id: I0c88fd31595bcea62a087f219acb9ecf9c80f2e5
 2015-04-23 12:07:16 -07:00
Dimitry Ivanov
bc83d0bb68 am 893ed24d: am 387a9fee: am 941d61de: am 1ff47c7f: Merge "Revert "Pack relocation tables for all dynamic executables"" 
* commit '893ed24dd7cec9b560fe46862b3635efa327ec65':
  Revert "Pack relocation tables for all dynamic executables"
 2015-04-23 05:07:11 +00:00
Dimitry Ivanov
387a9fee53 am 941d61de: am 1ff47c7f: Merge "Revert "Pack relocation tables for all dynamic executables"" 
* commit '941d61decc24cc28c781d0593b2a5d0589b4a7ad':
  Revert "Pack relocation tables for all dynamic executables"
 2015-04-23 04:44:50 +00:00
Dimitry Ivanov
1eca10fa9d Revert "Pack relocation tables for all dynamic executables" 
This reverts commit e7a1b8a0c6.

Change-Id: I1a2185e1c68d364941e3b3e525a8c4a7a42e0cc1
 2015-04-23 04:22:33 +00:00
Dmitriy Ivanov
943381b7df am ff084258: am b7b27621: am 64119a7f: am ec6a9773: Merge "Pack relocation tables for all dynamic executables" 
* commit 'ff084258ea53c414d724ba87f89c324056def1bd':
  Pack relocation tables for all dynamic executables
 2015-04-23 03:42:44 +00:00
Dmitriy Ivanov
b7b2762138 am 64119a7f: am ec6a9773: Merge "Pack relocation tables for all dynamic executables" 
* commit '64119a7ff23960615c607306c9190c1def622d23':
  Pack relocation tables for all dynamic executables
 2015-04-23 02:44:47 +00:00
dcashman
9d50b548cd resolved conflicts for merge of b9e4848e to master 
Change-Id: Ia1ea1c3cf7669c2eeaefa1f10c511aa1e782386b
 2015-04-22 14:49:23 -07:00
Dmitriy Ivanov
e7a1b8a0c6 Pack relocation tables for all dynamic executables 
Bug: http://b/18051137
Change-Id: I277277d5f5eb450ef9b4a23cfec16d75d977eb89
 2015-04-22 13:30:43 -07:00
dcashman
0ae8bf67af am 780bdd6a: am ab59266d: Merge "Add lib dirs to cts distribution." 
* commit '780bdd6a1363cfe2fb9425647e0458dd2aee43f4':
  Add lib dirs to cts distribution.
 2015-04-22 18:55:13 +00:00
dcashman
ab59266db0 Merge "Add lib dirs to cts distribution." 2015-04-22 17:02:32 +00:00
dcashman
17412c8305 Add lib dirs to cts distribution. 
Add ability to include dirs to the cts distribtion to enable bundling of shared
libraries on which host-side executables rely.

Bug: 19566396
Change-Id: Id501874244ae98fbfef2aa591885c88dee5b8b02
 2015-04-21 17:53:21 -07:00
Dmitriy Ivanov
594c0868d4 resolved conflicts for merge of 6cb3732d to master 
Change-Id: I6415638ccde1e78f74ae5d9527dc696d40f15e5f
 2015-04-20 14:08:43 -07:00
Dmitriy Ivanov
6cb3732d82 am baca453a: am 5beb3387: Merge "Remove unsupported *_COMPRESS_MODULE_SYMBOLS" 
* commit 'baca453a7d23fb2cf8a38d8aad3addbfce362afc':
  Remove unsupported *_COMPRESS_MODULE_SYMBOLS
 2015-04-20 20:43:18 +00:00
Dmitriy Ivanov
4eb120b999 Remove unsupported *_COMPRESS_MODULE_SYMBOLS 
Change-Id: Ibb7da2997a0bb5b9f435213c9d3206bc4aad18db
 2015-04-20 12:24:12 -07:00
Nick Kralevich
445e111def Error out if LOCAL_PREBUILT_JNI_LIBS and LOCAL_CERTIFICATE := PRESIGNED are used 
LOCAL_PREBUILT_JNI_LIBS is an indication to the build system that
all shared libraries should be deleted from an APK, and the shared
libraries should be placed in the application's /system/app directory.

However, using this option isn't appropriate for pre-signed APKs.
Any attempt to delete files from a pre-signed APK will corrupt it's
signature or waste disk space.

Bug: 20247329
Bug: 8076853
Bug: 1162500
Change-Id: I89ce8f06d3889dd79dd9ffe86fc5fa60814498ad
 2015-04-18 15:11:36 -07:00
Nick Kralevich
e128152c4c am ebe3f7a5: am 700265ce: am 69b20474: Merge "Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs" 
* commit 'ebe3f7a59878d797f8f0de234f251958fee1c5af':
  Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs
 2015-04-18 01:33:09 +00:00
Nick Kralevich
ebe3f7a598 am 700265ce: am 69b20474: Merge "Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs" 
* commit '700265cee29c442369bfa6ee3f90bd51b79177d9':
  Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs
 2015-04-18 01:00:47 +00:00
Nick Kralevich
5aa0223c6a Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs 
If a prebuilt APK contains shared libraries and the flag
LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES := true is set, then
uncompress any shared libraries stored within the APK.
This allows processes to load the shared library directly from
the APK.

Bug: 20247329
Bug: 8076853
Bug: 1162500
Change-Id: Iac4db32457d9ce31eb7256410023819b44fda0a6
 2015-04-17 16:53:15 -07:00
Dan Albert
c2bc25496d am 07607526: am 63082eab: am b6874440: Merge "Add support for a partial ubsan build." 
* commit '07607526b8701f471869aecbd89fe4ea1990251e':
  Add support for a partial ubsan build.
 2015-04-17 20:14:13 +00:00
Dan Albert
07607526b8 am 63082eab: am b6874440: Merge "Add support for a partial ubsan build." 
* commit '63082eab1f1e18b06882fbbaf08ee64c3f68193a':
  Add support for a partial ubsan build.
 2015-04-17 19:53:03 +00:00
Dmitriy Ivanov
cc39abfdd2 am a6c44859: am bc671bc6: am e3aa1c1f: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS" 
* commit 'a6c44859c5344d489526641ce5a08598254da57b':
  Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
 2015-04-17 19:42:55 +00:00
Dan Albert
b687444051 Merge "Add support for a partial ubsan build." 2015-04-17 19:33:02 +00:00
Dan Albert
5da97b217a am 048b3eb0: am 7a1d29eb: am 1d8f780c: Merge "Fix misuse of my_sanitize_host." 
* commit '048b3eb0170b8816cd97400a43f7f1523c19c210':
  Fix misuse of my_sanitize_host.
 2015-04-17 19:30:22 +00:00
Dan Albert
c08f725cd8 am 757417f9: am f1b7c073: am 6ed5bea4: Merge "Make use of sanitizers without clang an error." 
* commit '757417f9438a3a83d9fa1f7b10d74436fd6f61e4':
  Make use of sanitizers without clang an error.
 2015-04-17 19:30:20 +00:00
Dmitriy Ivanov
a6c44859c5 am bc671bc6: am e3aa1c1f: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS" 
* commit 'bc671bc65ee8db4ba0bba33543d41d372f424f9d':
  Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
 2015-04-17 19:20:25 +00:00
Dan Albert
048b3eb017 am 7a1d29eb: am 1d8f780c: Merge "Fix misuse of my_sanitize_host." 
* commit '7a1d29eb4bea37a4f043330cf722f720103129b8':
  Fix misuse of my_sanitize_host.
 2015-04-17 19:09:00 +00:00
Dan Albert
757417f943 am f1b7c073: am 6ed5bea4: Merge "Make use of sanitizers without clang an error." 
* commit 'f1b7c073a4d1b3f47811b6b9e85c6589d293c373':
  Make use of sanitizers without clang an error.
 2015-04-17 19:08:59 +00:00
Dmitriy Ivanov
e3aa1c1f85 Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS" 2015-04-17 18:50:13 +00:00
Dmitriy Ivanov
8f9487431c Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS 
Use LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES instead.

Change-Id: Id30529fbc1652d066e0008813352848b5e404ab9
 2015-04-17 11:39:04 -07:00
Dan Albert
b5b2ffe3be Add support for a partial ubsan build. 
Some of the ubsan checks expose a few pathological performance cases
in clang, and thus aren't suited to be used in SANITIZE_HOST.

This mode is also supported on the target despite not having the
target runtime libraries for ubsan by generating traps.

Change-Id: I0b0f0a08ca84d72e44e2174a66726b1c5e5cad7e
 2015-04-17 11:37:03 -07:00
Dan Albert
4c92a68127 Fix misuse of my_sanitize_host. 
Ying pointed out in https://android-review.googlesource.com/#/c/147290
that my_sanitize_host would be read as some garbage value for target
builds. Move the configuration later and don't use the local at all.

Change-Id: Id8a095821d000a184e72f950b9481597073a7044
 2015-04-17 11:32:57 -07:00
Dan Albert
94b579166f Make use of sanitizers without clang an error. 
Previously using a sanitizer would imply clang. It should be an error
instead so it's more obvious.

Change-Id: I67c949bfda3718a0d19da7e358b5fde447fce334
 2015-04-17 11:06:24 -07:00
Dan Albert
f52cf64f6c am fad70977: am cf6e1ff6: am 27176208: Merge "Clean up sanitizer configuration." 
* commit 'fad709772e766ce83b4667e89a25a7f0d90ca5f8':
  Clean up sanitizer configuration.
 2015-04-17 17:32:23 +00:00
Dan Albert
fad709772e am cf6e1ff6: am 27176208: Merge "Clean up sanitizer configuration." 
* commit 'cf6e1ff62a0abbea186d5a62f23d0b71671202ca':
  Clean up sanitizer configuration.
 2015-04-17 17:08:55 +00:00
Dan Albert
27ccb75af7 Clean up sanitizer configuration. 
* Refactor a few pieces to avoid deeply nested conditionals.
 * LOCAL_SANITIZE := never replaces LOCAL_ADDRESS_SANITIZER := false.

Change-Id: I68bb8c5edda6ecd40179c5ba9f18d06e96aaa260
 2015-04-17 09:39:12 -07:00
Dan Albert
97952ce8ac am 3bc25d69: am 683a387e: am 4ed95088: Merge "Add support for ubsan." 
* commit '3bc25d69580b5cdedd834fe6accf9cc27c0fb102':
  Add support for ubsan.
 2015-04-15 22:56:21 +00:00
Dan Albert
3bc25d6958 am 683a387e: am 4ed95088: Merge "Add support for ubsan." 
* commit '683a387efb079fefd3d2895875868b7c2a5a4a06':
  Add support for ubsan.
 2015-04-15 22:32:08 +00:00
Dan Albert
4ed9508842 Merge "Add support for ubsan." 2015-04-15 22:06:15 +00:00
Ying Wang
87a21c8b89 resolved conflicts for merge of eec386a4 to master 
Change-Id: Ia686e67ed480427a6422d87bef2dcd4e44e27266
 2015-04-15 14:39:26 -07:00
Kenny Root
eec386a4df am 68dc5196: am 03c6e8c5: Merge "Move package signing after file stripping" 
* commit '68dc5196226406db84a41a03fe70e6278ed35fcd':
  Move package signing after file stripping
 2015-04-15 20:12:21 +00:00
Kenny Root
dff3755a93 Move package signing after file stripping 
For dex preopt and JNI library extraction, we should remove the
classes.dex and .so files before we sign the APK so that there
isn't an entry in the manifest.

Prebuilt APKs which are pre-signed will simply not have the files
removed. This may cause some system.img bloat, but signature checks make
this necessary.

Bug: 20247329
Change-Id: I4742d1aa3aa64ab5aea2264304cb8c0bea24f784
 2015-04-15 12:40:22 -07:00
Ying Wang
599b07a4b2 Merge "Auto-clean host tools when switching between apps_only and platform build." 2015-04-15 17:10:05 +00:00
Mark Salyzyn
4660814b51 am d6d6077c: am 2f1bc255: am 8b75ec1c: Merge "disttools: add liblog, libcutils and libselinux shared libraries" 
* commit 'd6d6077c999e4ef335312f2740d5d7ad20572f79':
  disttools: add liblog, libcutils and libselinux shared libraries
 2015-04-15 15:28:39 +00:00
Mark Salyzyn
d6d6077c99 am 2f1bc255: am 8b75ec1c: Merge "disttools: add liblog, libcutils and libselinux shared libraries" 
* commit '2f1bc255fc7f0f5a8f6fd96296a119120bc04726':
  disttools: add liblog, libcutils and libselinux shared libraries
 2015-04-15 15:05:55 +00:00
Mark Salyzyn
8b75ec1c7b Merge "disttools: add liblog, libcutils and libselinux shared libraries" 2015-04-15 14:45:05 +00:00
Yohann Roussel
77cbe10fd9 Use Jack launcher 
Bug: 20132430
Change-Id: I6e30ad3dffbb32824a4c62e562359b084e6a8784
 2015-04-15 12:29:01 +02:00
Dan Albert
cbdd2c348f am 1fa6d5b0: am 612581e8: am ad1961a7: Merge "Don\'t use libunwindbacktrace for non-ARM." 
* commit '1fa6d5b0a3fc873bce4d16056c115bf30e62a147':
  Don't use libunwindbacktrace for non-ARM.
 2015-04-14 23:56:11 +00:00
Dan Albert
1fa6d5b0a3 am 612581e8: am ad1961a7: Merge "Don\'t use libunwindbacktrace for non-ARM." 
* commit '612581e8ca8bda8c7f74e84fbb9b7859ca3b9840':
  Don't use libunwindbacktrace for non-ARM.
 2015-04-14 23:34:03 +00:00
Dan Albert
ad1961a747 Merge "Don't use libunwindbacktrace for non-ARM." 2015-04-14 23:17:41 +00:00
Dan Albert
c2ac7201a7 am 803cf699: am 5e7e6d75: am 2d215e38: Merge "Use libcompiler_rt-extras on the host too." 
* commit '803cf699262275a771e3211751e77d2817718656':
  Use libcompiler_rt-extras on the host too.
 2015-04-14 23:08:47 +00:00
Dan Albert
803cf69926 am 5e7e6d75: am 2d215e38: Merge "Use libcompiler_rt-extras on the host too." 
* commit '5e7e6d7585ff94198a5ddd891faba274cf2416d6':
  Use libcompiler_rt-extras on the host too.
 2015-04-14 22:48:57 +00:00
Mark Salyzyn
c506e74dc8 disttools: add liblog, libcutils and libselinux shared libraries 
Bug: 19908228
Change-Id: I48450a9fb917408cb3bc0e41d70c0593acd2b884
 2015-04-14 15:17:16 -07:00
Dan Albert
2d215e38c0 Merge "Use libcompiler_rt-extras on the host too." 2015-04-14 22:04:56 +00:00
Dan Albert
3e99e66213 Don't use libunwindbacktrace for non-ARM. 
After fixing the link order here, it seems libunwindbacktrace no
longer works for exception unwinding, but libgcc now does.

Change-Id: Ice79af4b8f234ed6a053ee818b6dec3aa9706c8a
 2015-04-14 14:42:45 -07:00
Ying Wang
036b53b6de Auto-clean host tools when switching between apps_only and platform build. 
For apps_only (also PDK build) we use prebuilt host tools in
prebuilts/sdk/tools; For platform build we use tools built from source.
Auto-clean intermediate files of these tools when build type change is
detected.

Bug: 20213206
Change-Id: I9173af322684c017fdb91a3abfbe39ecfe5650e9
 2015-04-14 14:14:19 -07:00
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
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
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
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
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
Yohann Roussel
d191667006 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
 2015-04-07 23:43:36 +02:00
Yohann Roussel
abee3a9f41 Don't call Jack directly, use the script instead 
Change-Id: Ic9d4aa3cb543ab748423f4ea0d060544a4ea44e6
 2015-04-07 23:42:53 +02:00
Ying Wang
faeb693174 Consolidate the nanopb-c and regular protobuf build rules. 
Bug: 20093047
Change-Id: I38ebd748aacce6d215403da481ad04833810a995
 2015-04-07 12:49:50 -07:00
Ying Wang
11e923a0e5 am ea517854: am aacc8bb4: am 18ecae31: Merge "Convert bc depfiles to .P files." 
* commit 'ea5178545bf939fb65f77cd54eba9f274512638b':
  Convert bc depfiles to .P files.
 2015-04-04 01:49:47 +00:00
Ying Wang
ea5178545b am aacc8bb4: am 18ecae31: Merge "Convert bc depfiles to .P files." 
* commit 'aacc8bb4efb993e1d5ae539aa154c60d84a926dc':
  Convert bc depfiles to .P files.
 2015-04-04 01:29:29 +00:00
Ying Wang
aacc8bb4ef am 18ecae31: Merge "Convert bc depfiles to .P files." 
* commit '18ecae31e62365d658406ff33a93358beeb87553':
  Convert bc depfiles to .P files.
 2015-04-04 01:19:52 +00:00
Rom Lemarchand
c5b06258f0 Merge "Add the new audio include path on the list of default includes" 2015-04-04 01:13:51 +00:00
Ying Wang
18ecae31e6 Merge "Convert bc depfiles to .P files." 2015-04-04 01:09:55 +00:00
Ying Wang
b931956076 Convert bc depfiles to .P files. 
So you don't need clean step when a header file gets moved or deleted.

Change-Id: Iec0d63b89ba17c4ef0ad75f4a52b6759f2bff58a
 2015-04-03 16:55:09 -07:00
Elliott Hughes
2beb83dd62 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.
 2015-04-03 22:44:06 +00:00
Elliott Hughes
5432d3551d am 7616909b: am 519751a8: Merge "There\'s no such thing as _THREAD_SAFE." 
* commit '7616909b5e24289eb7caecb4708f0c69a09a26f9':
  There's no such thing as _THREAD_SAFE.
 2015-04-03 22:23:06 +00:00
Rom Lemarchand
93dda7cd8c Add the new audio include path on the list of default includes 
Change-Id: If40ba57cb97f86802c2872772672a380afc4d947
 2015-04-03 15:09:11 -07:00
Elliott Hughes
7616909b5e am 519751a8: Merge "There\'s no such thing as _THREAD_SAFE." 
* commit '519751a88217e6fdc3b86979ffaf61ff03d92312':
  There's no such thing as _THREAD_SAFE.
 2015-04-03 22:05:32 +00:00
Elliott Hughes
11c84463ea am aa1bd146: am d9ac3e9a: am 97bcf915: Merge "Remove HAVE_PRINTF_ZD." 
* commit 'aa1bd1462dc019b6096e92e4888b577522139b52':
  Remove HAVE_PRINTF_ZD.
 2015-04-03 20:58:27 +00:00
Elliott Hughes
98ff711a5d 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
 2015-04-03 13:41:10 -07:00
Elliott Hughes
aa1bd1462d am d9ac3e9a: am 97bcf915: Merge "Remove HAVE_PRINTF_ZD." 
* commit 'd9ac3e9ad6079cf402e5c6895d54e0b3e3e2c455':
  Remove HAVE_PRINTF_ZD.
 2015-04-03 20:40:54 +00:00
Elliott Hughes
d9ac3e9ad6 am 97bcf915: Merge "Remove HAVE_PRINTF_ZD." 
* commit '97bcf915ad005a4baeb981ed8da09ab219973b1f':
  Remove HAVE_PRINTF_ZD.
 2015-04-03 20:30:45 +00:00
Elliott Hughes
7f131dbe07 am 6f4befa0: am 5d375b92: am dbaee628: Merge "Remove HAVE_STRLCPY." 
* commit '6f4befa0535749b55c5c5a859611fe855c26e369':
  Remove HAVE_STRLCPY.
 2015-04-03 20:24:24 +00:00
Elliott Hughes
8a11491bc9 Remove HAVE_PRINTF_ZD. 
Change-Id: Ie7677e4816ad886c13a8ac869e7c7342082a350f
 2015-04-03 13:05:53 -07:00
Elliott Hughes
6f4befa053 am 5d375b92: am dbaee628: Merge "Remove HAVE_STRLCPY." 
* commit '5d375b92fcedd9db052eb0ed3834361002e7699f':
  Remove HAVE_STRLCPY.
 2015-04-03 19:59:00 +00:00
Elliott Hughes
5d375b92fc am dbaee628: Merge "Remove HAVE_STRLCPY." 
* commit 'dbaee628ec6a8215b59db66dac86846e6481263a':
  Remove HAVE_STRLCPY.
 2015-04-03 19:48:11 +00:00
Elliott Hughes
dbaee628ec Merge "Remove HAVE_STRLCPY." 2015-04-03 19:42:06 +00:00
Ying Wang
301bd9341f 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.
 2015-04-03 17:39:56 +00:00
Ying Wang
a840faef51 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.
 2015-04-03 17:15:06 +00:00
Ying Wang
6494a6ef8f 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
 2015-04-03 17:07:37 +00:00
Ying Wang
c35e790267 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.
 2015-04-03 17:04:29 +00:00
Ying Wang
555b7770fe Merge "Move the inclusion of depfile to where it's generated." 2015-04-03 16:55:44 +00:00
Ying Wang
cddece6f8f Move the inclusion of depfile to where it's generated. 
Change-Id: Ib7ed6d7d9105e49961ac467fd1d390060d4f5c38
 2015-04-03 09:53:41 -07:00
Ying Wang
0216641e04 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
 2015-04-03 16:14:37 +00:00
Ying Wang
6fe4ab9487 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
 2015-04-03 16:04:43 +00:00
Ying Wang
58912c874b Merge "Don't fail build of otatools if there are no device certificates" 2015-04-03 15:57:57 +00:00
Ying Wang
b70c42079a am 5c11bd52: am 20fa9a8e: am 62003acd: Merge "Use PRIVATE_ALL_OBJECTS" 
* commit '5c11bd52db5d0887196895f321bf723ca1d206c7':
  Use PRIVATE_ALL_OBJECTS
 2015-04-03 14:52:55 +00:00
Elliott Hughes
3101e61f5e resolved conflicts for merge of e04e91b1 to master 
Change-Id: I537065b0810ea8525401778824c4810c5e7ef433
 2015-04-03 07:43:46 -07:00
Ying Wang
5c11bd52db am 20fa9a8e: am 62003acd: Merge "Use PRIVATE_ALL_OBJECTS" 
* commit '20fa9a8e65cd84cabc563f87839706d9f7308a8f':
  Use PRIVATE_ALL_OBJECTS
 2015-04-03 01:19:10 +00:00
Ying Wang
20fa9a8e65 am 62003acd: Merge "Use PRIVATE_ALL_OBJECTS" 
* commit '62003acdcc2ecdc13ce2a9880c35147d2070e865':
  Use PRIVATE_ALL_OBJECTS
 2015-04-03 01:11:22 +00:00
Ying Wang
62003acdcc Merge "Use PRIVATE_ALL_OBJECTS" 2015-04-03 01:03:50 +00:00
Ying Wang
854607ec49 Use PRIVATE_ALL_OBJECTS 
Instead of the dirty $(filter) call.

Change-Id: Idd3c9be570a00dc365a08e5b4ba1cb2e1f0ce005
 2015-04-02 18:02:33 -07:00
Elliott Hughes
8f06d8afb8 Remove HAVE_STRLCPY. 
Change-Id: I27864a9075183de5bd83569d53a00fc2f53c96df
 2015-04-02 16:43:52 -07:00
Chih-Hung Hsieh
e04e91b1fb 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.
 2015-04-02 22:35:34 +00:00
Chih-Hung Hsieh
ead6162694 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.
 2015-04-02 22:28:30 +00:00
Chih-Hung Hsieh
9205bc1da6 Filter out gcc flags that are not recognized by clang. 
Change-Id: I04e95fc3b0cb2825bf90a55916f89d25fa9fc475
 2015-04-02 14:42:20 -07:00
Ying Wang
e183b84e11 am 4a284ac3: am da885b90: am 71d4c95f: Merge "Fix typo." 
* commit '4a284ac3e04a2af8031b6ef5471db22687e5a2db':
  Fix typo.
 2015-04-02 20:27:50 +00:00
Ying Wang
4a284ac3e0 am da885b90: am 71d4c95f: Merge "Fix typo." 
* commit 'da885b90e4c47a0e29597da185ec95a7e4e3a73c':
  Fix typo.
 2015-04-02 20:07:52 +00:00
Ying Wang
da885b90e4 am 71d4c95f: Merge "Fix typo." 
* commit '71d4c95f83018199b8e79d0800dd2eca80b9f728':
  Fix typo.
 2015-04-02 19:57:49 +00:00
Ying Wang
71d4c95f83 Merge "Fix typo." 2015-04-02 19:49:13 +00:00
Ying Wang
36b039a2d6 Fix typo. 
Change-Id: Ic934ed8610a4f03fbfb3d06dff4d911734a9d818
 2015-04-02 12:48:32 -07:00
Dan Albert
57d71306a5 am 8f7338d9: am dc8d7092: am 0064c51e: Merge "Use prebuilt libclang_rt.profile." 
* commit '8f7338d9b145379ea9c51b7e551509a2d8f0f24e':
  Use prebuilt libclang_rt.profile.
 2015-04-02 18:49:26 +00:00
Dan Albert
8f7338d9b1 am dc8d7092: am 0064c51e: Merge "Use prebuilt libclang_rt.profile." 
* commit 'dc8d7092db0b2d5754931ae130da5b1790a7d670':
  Use prebuilt libclang_rt.profile.
 2015-04-02 18:25:35 +00:00
Dan Albert
dc8d7092db am 0064c51e: Merge "Use prebuilt libclang_rt.profile." 
* commit '0064c51efee452daae110eac99b1321c00652c17':
  Use prebuilt libclang_rt.profile.
 2015-04-02 18:14:48 +00:00
Claes Elgemark
ed1158e01f Don't fail build of otatools if there are no device certificates 
Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
 2015-04-02 17:38:29 +00:00
Etan Cohen
c74a3b4cae Merge "Merge commit '597cfdb' into merge" 2015-04-02 03:11:00 +00:00
Dan Albert
343ed674e3 Use prebuilt libclang_rt.profile. 
Bug: 17574078
Change-Id: I4838cd5d125a0b2bf76aad2fdaef1ee3122687e8
 2015-04-01 19:03:22 -07:00
Stephen Hines
55ae50dc1d am 95212b90: am 31f35975: am 9a98c47c: Merge "Don\'t warn on definition of possibly reserved identifiers." 
* commit '95212b900b7a9a205d6f8b79dc3fcc07576c18cd':
  Don't warn on definition of possibly reserved identifiers.
 2015-04-01 22:09:03 +00:00
Neil Fuller
57df23e40a am 080d2f32: am 2e4c6762: am 2ff6a3bb: Merge "Add explicit dependency on tzdata_updates_intermediates for CTS" 
* commit '080d2f32add01c513913ec50acd9defee9cb7dfa':
  Add explicit dependency on tzdata_updates_intermediates for CTS
 2015-04-01 19:13:29 +00:00
Stephen Hines
95212b900b 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.
 2015-04-01 19:09:58 +00:00
Stephen Hines
31f3597517 am 9a98c47c: Merge "Don\'t warn on definition of possibly reserved identifiers." 
* commit '9a98c47c64446e0c46f1d24f3d6526d177b62e14':
  Don't warn on definition of possibly reserved identifiers.
 2015-04-01 18:59:07 +00:00
Stephen Hines
9a98c47c64 Merge "Don't warn on definition of possibly reserved identifiers." 2015-04-01 18:50:29 +00:00
Neil Fuller
080d2f32ad 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
 2015-04-01 18:05:28 +00:00
Neil Fuller
2e4c67624c am 2ff6a3bb: Merge "Add explicit dependency on tzdata_updates_intermediates for CTS" 
* commit '2ff6a3bbdf3a086e5e9a89e9acc66e8c5ae00539':
  Add explicit dependency on tzdata_updates_intermediates for CTS
 2015-04-01 17:54:44 +00:00
Neil Fuller
2ff6a3bbdf Merge "Add explicit dependency on tzdata_updates_intermediates for CTS" 2015-04-01 17:43:54 +00:00
Tao Bao
521a8dbd18 am 93d46584: am ae26f5b0: am 53602955: Merge "Add support to sign bootable images with vboot_signer" 
* commit '93d46584170a9aae1728cdb9010eef41e25b4d4a':
  Add support to sign bootable images with vboot_signer
 2015-04-01 17:33:36 +00:00
Dan Albert
cb8436b78f am 320d9764: am 071af0ac: am b8765797: Merge "Add unwinder linking to STL setup." 
* commit '320d976429f0f08b9954edca13930442f63300a8':
  Add unwinder linking to STL setup.
 2015-04-01 17:27:34 +00:00
Dan Albert
7d1c9d312d am 8985a409: am 0ea16fcc: am 60335c03: Merge "Revert "Revert "Fix the libgcc/libatomic link order.""" 
* commit '8985a409b75e23dcadd0cb743a344876a95eb5d8':
  Revert "Revert "Fix the libgcc/libatomic link order.""
 2015-04-01 17:27:32 +00:00
Tao Bao
93d4658417 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
 2015-04-01 17:15:29 +00:00
Tao Bao
ae26f5b002 am 53602955: Merge "Add support to sign bootable images with vboot_signer" 
* commit '536029551d31d8084c444063349291781ee43ae1':
  Add support to sign bootable images with vboot_signer
 2015-04-01 17:05:36 +00:00
Neil Fuller
391d4e9c75 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
 2015-04-01 18:02:46 +01:00
Dan Albert
320d976429 am 071af0ac: am b8765797: Merge "Add unwinder linking to STL setup." 
* commit '071af0ac49ab87e4d365056a8ff764177f56b428':
  Add unwinder linking to STL setup.
 2015-04-01 16:59:48 +00:00
Dan Albert
8985a409b7 am 0ea16fcc: am 60335c03: Merge "Revert "Revert "Fix the libgcc/libatomic link order.""" 
* commit '0ea16fcca3383bda04e873032d7721324ec90c42':
  Revert "Revert "Fix the libgcc/libatomic link order.""
 2015-04-01 16:59:46 +00:00
Tao Bao
536029551d Merge "Add support to sign bootable images with vboot_signer" 2015-04-01 16:54:44 +00:00
Dan Albert
071af0ac49 am b8765797: Merge "Add unwinder linking to STL setup." 
* commit 'b8765797a89eebc97e38afcb94a965d69a8663ef':
  Add unwinder linking to STL setup.
 2015-04-01 16:49:11 +00:00
Dan Albert
0ea16fcca3 am 60335c03: Merge "Revert "Revert "Fix the libgcc/libatomic link order.""" 
* commit '60335c03d7e897267eb20e0b0a6c7c864fd08b43':
  Revert "Revert "Fix the libgcc/libatomic link order.""
 2015-04-01 16:49:10 +00:00
Tao Bao
d95e9fd267 Add support to sign bootable images with vboot_signer 
Add vboot properties to the dictionary file, which will be packed into
the target_files zip. Add support in packaging and OTA scripts to
sign the generated bootable images (boot.img and recovery.img) when
vboot is enabled.

Change-Id: I08758ced03d173219415bca762bbdb66c464a9f5
(cherry picked from commit 5d5a3bd9e8d8b14b71d1b2105417a2958d13d3d2)
 2015-04-01 09:23:08 -07:00
Dan Albert
5036729c41 Add unwinder linking to STL setup. 
Previously we were bundling this into libc++ and having each binary
resolve its symbols from there. This means that the unwinder that gets
used for a given binary is sensitive to the order in which its
libraries are linked. Making this a static library dependency of each
binary means the right unwinder will always be used.

Bug: 18471342
Bug: 19958712
Change-Id: I782d212784dbf85355b5d9146d7460d675259a0e
 2015-03-31 18:29:23 -07:00
Dan Albert
91f713a168 Revert "Revert "Fix the libgcc/libatomic link order."" 
This reverts commit e440c3c07b.
 2015-03-31 16:42:52 -07:00
Neil Fuller
e635e67252 am 0fd4a729: am 2f78e36d: am 3cc6a0f2: Merge "Addition of a CTS suite for tzdata update code" 
* commit '0fd4a7293ec1d252fcd5ad74ab12d7782b0d92bf':
  Addition of a CTS suite for tzdata update code
 2015-03-31 10:22:15 +00:00
Neil Fuller
0fd4a7293e am 2f78e36d: am 3cc6a0f2: Merge "Addition of a CTS suite for tzdata update code" 
* commit '2f78e36ddee92938a9dddd0484781037b5b496eb':
  Addition of a CTS suite for tzdata update code
 2015-03-31 09:31:59 +00:00
Neil Fuller
2f78e36dde am 3cc6a0f2: Merge "Addition of a CTS suite for tzdata update code" 
* commit '3cc6a0f22f285c3fd8fb7f0b6559dd24b43e6541':
  Addition of a CTS suite for tzdata update code
 2015-03-31 09:25:12 +00:00
Neil Fuller
3cc6a0f22f Merge "Addition of a CTS suite for tzdata update code" 2015-03-31 08:30:51 +00:00
Etan Cohen
5c92a46ea3 Merge commit '597cfdb' into merge 
Change-Id: I4df718345626439ece9fdad242cccea7d6930819
 2015-03-30 16:42:42 -07:00
Chih-hung Hsieh
cdac639599 am 29b415aa: am 1e9b11f4: am d63c78e0: Merge "Allow -mcpu=cortex-a15 for clang" 
* commit '29b415aa7781b27fc4948307acc5961cd702dac2':
  Allow -mcpu=cortex-a15 for clang
 2015-03-27 23:49:27 +00:00
Chih-hung Hsieh
29b415aa77 am 1e9b11f4: am d63c78e0: Merge "Allow -mcpu=cortex-a15 for clang" 
* commit '1e9b11f4b15982896a85cc70c25f6632395b4e29':
  Allow -mcpu=cortex-a15 for clang
 2015-03-27 23:26:15 +00:00
Chih-hung Hsieh
1e9b11f4b1 am d63c78e0: Merge "Allow -mcpu=cortex-a15 for clang" 
* commit 'd63c78e058da1418db133f62df4ace6f8109965b':
  Allow -mcpu=cortex-a15 for clang
 2015-03-27 23:17:43 +00:00
Chih-hung Hsieh
d63c78e058 Merge "Allow -mcpu=cortex-a15 for clang" 2015-03-27 22:33:04 +00:00
Ying Wang
f6dfd7b608 am ddc5a8f7: am 8ffec13d: Merge "Add back Java resources to apk without Java code." 
* commit 'ddc5a8f78c1e5a180bb23878b4f47b68a91f8ed9':
  Add back Java resources to apk without Java code.
 2015-03-27 21:09:39 +00:00
Ying Wang
ddc5a8f78c am 8ffec13d: Merge "Add back Java resources to apk without Java code." 
* commit '8ffec13d9b3ea46a5aea1837c1184e67a908f1ef':
  Add back Java resources to apk without Java code.
 2015-03-27 18:47:31 +00:00
Ying Wang
454bcff255 Add back Java resources to apk without Java code. 
With commit 33360dd569 we moved Java
resource packaging forward to creation of the jar file. But the Java
resource packaging will be skipped if a module has no Java code at all.
(The build system does support building an apk without Java code.)
In this change we add back the Java resources directly to the built apk
when the apk has no Java code.

(cherry-picked from commit 8b27d1879c)

Bug: 19947218
Change-Id: I0e1a65a9cbe656974f8ef3923b2f15e9efa5feb9
 2015-03-27 11:30:51 -07:00
Ying Wang
e01d2ab927 Merge "Add back Java resources to apk without Java code." 2015-03-27 18:17:12 +00:00
Nicholas Sauer
d7af937a03 Merge "Add required projects to pdk build on master." 2015-03-27 18:16:04 +00:00
Ying Wang
8b27d1879c Add back Java resources to apk without Java code. 
With commit 33360dd569 we moved Java
resource packaging forward to creation of the jar file. But the Java
resource packaging will be skipped if a module has no Java code at all.
(The build system does support building an apk without Java code.)
In this change we add back the Java resources directly to the built apk
when the apk has no Java code.

Bug: 19947218
Change-Id: I0e1a65a9cbe656974f8ef3923b2f15e9efa5feb9
 2015-03-27 11:15:17 -07:00
Nicholas Sauer
52b0026f90 Merge "Add classes.jack to the pdk build" 2015-03-27 18:02:42 +00:00
Ying Wang
b6b83e9f99 am 8853f518: am 55adb5a3: am 1b23b33d: Merge "MKBOOTIMG override were missing in two places" 
* commit '8853f5181b1ae1682d9433c28e120f25f63a4721':
  MKBOOTIMG override were missing in two places
 2015-03-27 17:15:46 +00:00
Ying Wang
8853f5181b am 55adb5a3: am 1b23b33d: Merge "MKBOOTIMG override were missing in two places" 
* commit '55adb5a380f801038c00b2e169d33b6da93dfacc':
  MKBOOTIMG override were missing in two places
 2015-03-27 16:59:35 +00:00
Ying Wang
55adb5a380 am 1b23b33d: Merge "MKBOOTIMG override were missing in two places" 
* commit '1b23b33d92f32626584153739308e9147d1541bd':
  MKBOOTIMG override were missing in two places
 2015-03-27 16:52:49 +00:00