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
d9509e970c
resolved conflicts for merge of 133415d5 to master
...
Change-Id: Iba6c1dd40e7a4c8058e7100f03296c8f72a2c949
2015-04-08 18:08:46 -07:00
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
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
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
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
87df99f2f6
Merge "Fix the font size selection for recovery mode"
2015-04-08 23:57:31 +00:00
2594d3d121
Merge "Remove unnecessary confusing use of $(intermediate)."
2015-04-08 23:40:34 +00:00
62925a993a
Remove unnecessary confusing use of $(intermediate).
...
Change-Id: I0e73c3c1bf94540419e1fd227a3096da148e2459
2015-04-08 16:37:34 -07:00
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
6d08a0d3fc
Merge "AndroidConfig.h: ensure HAVE_MALLOC_H always has a value."
2015-04-08 22:50:03 +00:00
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
324784ab85
Merge "Omit ramdisk from boot.img if building without ramdisk"
2015-04-08 22:27:03 +00:00
f9c9266c75
Omit ramdisk from boot.img if building without ramdisk
...
Change-Id: I1940e3fd5f05dec555db04a556ed1fac58b2c15b
2015-04-08 15:11:47 -07:00
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
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
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
8a0d53e7f5
Rename libnanopb-c-2.8.0 to libprotobuf-c-nano.
...
Bug: 20093047
Change-Id: I787925fde97d1a3965cb8a9bf012f3c5a45a6aed
2015-04-08 09:54:34 -07:00
e3b60664ea
Merge "Consolidate the nanopb-c and regular protobuf build rules."
2015-04-08 16:22:17 +00:00
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
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
abee3a9f41
Don't call Jack directly, use the script instead
...
Change-Id: Ic9d4aa3cb543ab748423f4ea0d060544a4ea44e6
2015-04-07 23:42:53 +02:00
faeb693174
Consolidate the nanopb-c and regular protobuf build rules.
...
Bug: 20093047
Change-Id: I38ebd748aacce6d215403da481ad04833810a995
2015-04-07 12:49:50 -07:00
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
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
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
c5b06258f0
Merge "Add the new audio include path on the list of default includes"
2015-04-04 01:13:51 +00:00
18ecae31e6
Merge "Convert bc depfiles to .P files."
2015-04-04 01:09:55 +00:00
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
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
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
93dda7cd8c
Add the new audio include path on the list of default includes
...
Change-Id: If40ba57cb97f86802c2872772672a380afc4d947
2015-04-03 15:09:11 -07:00
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
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
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
aa1bd1462d
am d9ac3e9a: am 97bcf915: Merge "Remove HAVE_PRINTF_ZD."
...
* commit 'd9ac3e9ad6079cf402e5c6895d54e0b3e3e2c455':
Remove HAVE_PRINTF_ZD.
2015-04-03 20:40:54 +00:00
d9ac3e9ad6
am 97bcf915: Merge "Remove HAVE_PRINTF_ZD."
...
* commit '97bcf915ad005a4baeb981ed8da09ab219973b1f':
Remove HAVE_PRINTF_ZD.
2015-04-03 20:30:45 +00:00
7f131dbe07
am 6f4befa0: am 5d375b92: am dbaee628: Merge "Remove HAVE_STRLCPY."
...
* commit '6f4befa0535749b55c5c5a859611fe855c26e369':
Remove HAVE_STRLCPY.
2015-04-03 20:24:24 +00:00
8a11491bc9
Remove HAVE_PRINTF_ZD.
...
Change-Id: Ie7677e4816ad886c13a8ac869e7c7342082a350f
2015-04-03 13:05:53 -07:00
6f4befa053
am 5d375b92: am dbaee628: Merge "Remove HAVE_STRLCPY."
...
* commit '5d375b92fcedd9db052eb0ed3834361002e7699f':
Remove HAVE_STRLCPY.
2015-04-03 19:59:00 +00:00
5d375b92fc
am dbaee628: Merge "Remove HAVE_STRLCPY."
...
* commit 'dbaee628ec6a8215b59db66dac86846e6481263a':
Remove HAVE_STRLCPY.
2015-04-03 19:48:11 +00:00
dbaee628ec
Merge "Remove HAVE_STRLCPY."
2015-04-03 19:42:06 +00:00
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
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
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
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
555b7770fe
Merge "Move the inclusion of depfile to where it's generated."
2015-04-03 16:55:44 +00:00
cddece6f8f
Move the inclusion of depfile to where it's generated.
...
Change-Id: Ib7ed6d7d9105e49961ac467fd1d390060d4f5c38
2015-04-03 09:53:41 -07:00
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
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
58912c874b
Merge "Don't fail build of otatools if there are no device certificates"
2015-04-03 15:57:57 +00:00
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
3101e61f5e
resolved conflicts for merge of e04e91b1 to master
...
Change-Id: I537065b0810ea8525401778824c4810c5e7ef433
2015-04-03 07:43:46 -07:00
5c11bd52db
am 20fa9a8e: am 62003acd: Merge "Use PRIVATE_ALL_OBJECTS"
...
* commit '20fa9a8e65cd84cabc563f87839706d9f7308a8f':
Use PRIVATE_ALL_OBJECTS
2015-04-03 01:19:10 +00:00
20fa9a8e65
am 62003acd: Merge "Use PRIVATE_ALL_OBJECTS"
...
* commit '62003acdcc2ecdc13ce2a9880c35147d2070e865':
Use PRIVATE_ALL_OBJECTS
2015-04-03 01:11:22 +00:00
62003acdcc
Merge "Use PRIVATE_ALL_OBJECTS"
2015-04-03 01:03:50 +00:00
854607ec49
Use PRIVATE_ALL_OBJECTS
...
Instead of the dirty $(filter) call.
Change-Id: Idd3c9be570a00dc365a08e5b4ba1cb2e1f0ce005
2015-04-02 18:02:33 -07:00
8f06d8afb8
Remove HAVE_STRLCPY.
...
Change-Id: I27864a9075183de5bd83569d53a00fc2f53c96df
2015-04-02 16:43:52 -07:00
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
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
9205bc1da6
Filter out gcc flags that are not recognized by clang.
...
Change-Id: I04e95fc3b0cb2825bf90a55916f89d25fa9fc475
2015-04-02 14:42:20 -07:00
e183b84e11
am 4a284ac3: am da885b90: am 71d4c95f: Merge "Fix typo."
...
* commit '4a284ac3e04a2af8031b6ef5471db22687e5a2db':
Fix typo.
2015-04-02 20:27:50 +00:00
4a284ac3e0
am da885b90: am 71d4c95f: Merge "Fix typo."
...
* commit 'da885b90e4c47a0e29597da185ec95a7e4e3a73c':
Fix typo.
2015-04-02 20:07:52 +00:00
da885b90e4
am 71d4c95f: Merge "Fix typo."
...
* commit '71d4c95f83018199b8e79d0800dd2eca80b9f728':
Fix typo.
2015-04-02 19:57:49 +00:00
71d4c95f83
Merge "Fix typo."
2015-04-02 19:49:13 +00:00
36b039a2d6
Fix typo.
...
Change-Id: Ic934ed8610a4f03fbfb3d06dff4d911734a9d818
2015-04-02 12:48:32 -07:00
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
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
dc8d7092db
am 0064c51e: Merge "Use prebuilt libclang_rt.profile."
...
* commit '0064c51efee452daae110eac99b1321c00652c17':
Use prebuilt libclang_rt.profile.
2015-04-02 18:14:48 +00:00
ed1158e01f
Don't fail build of otatools if there are no device certificates
...
Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
2015-04-02 17:38:29 +00:00
c74a3b4cae
Merge "Merge commit '597cfdb' into merge"
2015-04-02 03:11:00 +00:00
343ed674e3
Use prebuilt libclang_rt.profile.
...
Bug: 17574078
Change-Id: I4838cd5d125a0b2bf76aad2fdaef1ee3122687e8
2015-04-01 19:03:22 -07:00
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
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
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
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
9a98c47c64
Merge "Don't warn on definition of possibly reserved identifiers."
2015-04-01 18:50:29 +00:00
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
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
2ff6a3bbdf
Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"
2015-04-01 17:43:54 +00:00
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
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
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
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
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
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
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
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
536029551d
Merge "Add support to sign bootable images with vboot_signer"
2015-04-01 16:54:44 +00:00
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
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
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
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
91f713a168
Revert "Revert "Fix the libgcc/libatomic link order.""
...
This reverts commit e440c3c07b
2015-03-31 16:42:52 -07:00
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
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
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
3cc6a0f22f
Merge "Addition of a CTS suite for tzdata update code"
2015-03-31 08:30:51 +00:00
5c92a46ea3
Merge commit '597cfdb' into merge
...
Change-Id: I4df718345626439ece9fdad242cccea7d6930819
2015-03-30 16:42:42 -07:00
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
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
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
d63c78e058
Merge "Allow -mcpu=cortex-a15 for clang"
2015-03-27 22:33:04 +00:00
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
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
454bcff255
Add back Java resources to apk without Java code.
...
With commit 33360dd5698b27d1879c
2015-03-27 11:30:51 -07:00
e01d2ab927
Merge "Add back Java resources to apk without Java code."
2015-03-27 18:17:12 +00:00
d7af937a03
Merge "Add required projects to pdk build on master."
2015-03-27 18:16:04 +00:00
8b27d1879c
Add back Java resources to apk without Java code.
...
With commit 33360dd569
2015-03-27 11:15:17 -07:00
52b0026f90
Merge "Add classes.jack to the pdk build"
2015-03-27 18:02:42 +00:00
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
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
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
1b23b33d92
Merge "MKBOOTIMG override were missing in two places"
2015-03-27 16:47:15 +00:00
1b2637e216
Add required projects to pdk build on master.
...
Added:
-android.test.runner_intermediates
-android-common_intermediates
-bouncycastle_intermediates
-conscrypt_intermediates
-okhttp_intermediates
Removed:
-mms-common_intermediates (which was deprecated)
Also, alphabetize the list.
Change-Id: Ida5ef79b7176edfe006f50d224bcd64b75843832
2015-03-27 09:28:45 -07:00
c2400c3b85
Add classes.jack to the pdk build
...
Change-Id: I66ce6681976526b35f08cfe9b23bf1a3f12bccc6
2015-03-27 07:58:56 -07:00
c3868ae371
resolved conflicts for merge of 6d607ee7 to lmp-mr1-dev-plus-aosp
...
Change-Id: I0a49bf5492cd5c1b03cf8cddd219db326d586909
2015-03-26 18:03:17 -07:00
1ded630dec
am 1c3bf5c3: DO NOT MERGE - Bump version to 5.1.1
...
* commit '1c3bf5c39d281be4b437bc1a367c49b72c6e10b9':
DO NOT MERGE - Bump version to 5.1.1
2015-03-27 00:35:28 +00:00
fcf0b13839
am ad54a4da: Add selinux and verity support to custom image generation.
...
* commit 'ad54a4dab520d84f76c9ad6a83be92b5563de24e':
Add selinux and verity support to custom image generation.
2015-03-27 00:33:25 +00:00
ac1da77e65
am e6b9f286: am bc9ade72: am d5415dc7: Merge "Fix: exit code is 0 even when check-boot-jars.py fails"
...
* commit 'e6b9f2869110a35316022c639bf3d932034783d3':
Fix: exit code is 0 even when check-boot-jars.py fails
2015-03-26 23:51:07 +00:00
e6b9f28691
am bc9ade72: am d5415dc7: Merge "Fix: exit code is 0 even when check-boot-jars.py fails"
...
* commit 'bc9ade722f2fe2d4dcc71931cdfd62661d822027':
Fix: exit code is 0 even when check-boot-jars.py fails
2015-03-26 23:37:47 +00:00
bc9ade722f
am d5415dc7: Merge "Fix: exit code is 0 even when check-boot-jars.py fails"
...
* commit 'd5415dc778abffdf7a9abba52b093da7a20496be':
Fix: exit code is 0 even when check-boot-jars.py fails
2015-03-26 23:30:42 +00:00
d5415dc778
Merge "Fix: exit code is 0 even when check-boot-jars.py fails"
2015-03-26 23:25:32 +00:00
1c7151876a
Merge "Add support to sign boot images with vboot."
2015-03-26 20:22:22 +00:00
f9910756dd
am c801deac: am 74b11051: am e7173cee: Merge "Store odex files in oat/<isa>/ directory."
...
* commit 'c801deac20c6944095e2316bb4b97b3dc3e11446':
Store odex files in oat/<isa>/ directory.
2015-03-26 18:19:19 +00:00
52ea2066a1
am abc748c1: am 6ff1b035: Merge "Support to build image of root file system with /system and ramdisk combined."
...
* commit 'abc748c11cbba71a99f306d318c74b5336b28730':
Support to build image of root file system with /system and ramdisk combined.
2015-03-26 17:57:22 +00:00
17be3d3921
Add support to sign boot images with vboot.
...
Change-Id: I924468fe06f7d38d4fc49c2ae9dfee734fd58867
Signed-off-by: David Riley <davidriley@google.com>
(cherry picked from commit 14fb7236c1942a9f5050b3e608a0f5f4cd1cae1d)
2015-03-26 17:54:40 +00:00
abc748c11c
am 6ff1b035: Merge "Support to build image of root file system with /system and ramdisk combined."
...
* commit '6ff1b0357289c1ef1a7aa9294aae748dacb69866':
Support to build image of root file system with /system and ramdisk combined.
2015-03-26 17:50:10 +00:00
a2292c94d1
Support to build image of root file system with /system and ramdisk combined.
...
Added support to build system.img that combines contents of /system and
the ramdisk, and can be mounted at the root of the file system.
To enable this feature, define BoardConfig.mk variable:
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
Ideally we would just change TARGET_OUT (the path of the staging system
directory) to under TARGET_ROOT_OUT. But at this point many places in
the build system assume TARGET_OUT is independent of TARGET_ROOT_OUT and
we can't make it easily configurable.
Instead this implementation takes the least intrusive approach:
We don't change TARGET_OUT or TARGET_ROOT_OUT. We just assemble a
temporary staging directory that contains contents of both TARGET_OUT
and TARGET_ROOT_OUT, in build_image.BuildImage() of
tools/releasetools/build_image.py.
When build_image.py is directly called from the makefile, we pass in the
parameters from the global dictionary; when build_image.BuildImage() is
called from add_img_to_target_files.py, we need to override values to
point to files extracted from the target_files zip file.
We need to combine the fs_config files of both /system and ramdisk,
when fs_config is enabled.
Also this change refactored build_image.BuildImage() by moving the extra
parameters to the image property dictionary.
(cherry-picked from commit 0eabd4f2c5
2015-03-26 10:35:00 -07:00
56128c5178
Addition of a CTS suite for tzdata update code
...
Bug: 19941636
Change-Id: Id0985f8c5be2f12858ee8bf52acf52bdb2df8741
2015-03-26 15:18:19 +00:00
c801deac20
am 74b11051: am e7173cee: Merge "Store odex files in oat/<isa>/ directory."
...
* commit '74b1105102ea00a30c516a06f8c5036d6ce44522':
Store odex files in oat/<isa>/ directory.
2015-03-26 15:11:26 +00:00
74b1105102
am e7173cee: Merge "Store odex files in oat/<isa>/ directory."
...
* commit 'e7173cee108fe82b0469c456f69fe5a4160d5192':
Store odex files in oat/<isa>/ directory.
2015-03-26 15:04:43 +00:00
e7173cee10
Merge "Store odex files in oat/<isa>/ directory."
2015-03-26 14:57:33 +00:00
eb745aaf74
Fix: exit code is 0 even when check-boot-jars.py fails
...
Fix the bug that build is still success when boot jars contain
non-whitelisted classes. Now, check-boot-jars.py correctly
finishes with exit code 1 when non-whitelisted classes are found.
Change-Id: Id5c80ef9fdb70213d878d569f6033be2c9eb90d3
2015-03-26 13:25:06 +09:00
1c3bf5c39d
DO NOT MERGE - Bump version to 5.1.1
...
Bug: 19939307
Change-Id: I069f514fe6d3759aa7dde38627c54f7bed38c1bb
2015-03-25 21:04:38 -07:00
f68002187a
Don't warn on definition of possibly reserved identifiers.
...
Change-Id: Icfcfa94aac0503c97dee0ff4d0cd49107201526d
2015-03-25 17:28:57 -07:00
9226f8fc3b
am 07aa4c1f: am a45223b6: Merge "Revert "Switch x86 and x86_64 to 4.9. Attempt #2.""
...
* commit '07aa4c1feea3e16a99f082b71a631b20ddb8dddf':
Revert "Switch x86 and x86_64 to 4.9. Attempt #2."
2015-03-25 18:58:54 +00:00
335b191800
am 5a8f7067: am e9b15e2c: Merge "Switch x86 and x86_64 to 4.9. Attempt #2."
...
* commit '5a8f70678b17e8628abcac8fc7c3b31ebd4dffc3':
Switch x86 and x86_64 to 4.9. Attempt #2 .
2015-03-25 18:58:52 +00:00
07aa4c1fee
am a45223b6: Merge "Revert "Switch x86 and x86_64 to 4.9. Attempt #2.""
...
* commit 'a45223b63566d8496250ae797778a4d16ee81419':
Revert "Switch x86 and x86_64 to 4.9. Attempt #2."
2015-03-25 18:50:10 +00:00
5a8f70678b
am e9b15e2c: Merge "Switch x86 and x86_64 to 4.9. Attempt #2."
...
* commit 'e9b15e2ccd07bb148b7fd7642658b9b54c0f47d0':
Switch x86 and x86_64 to 4.9. Attempt #2 .
2015-03-25 18:50:07 +00:00
a45223b635
Merge "Revert "Switch x86 and x86_64 to 4.9. Attempt #2.""
2015-03-25 18:28:53 +00:00
c9d2952e1e
Revert "Switch x86 and x86_64 to 4.9. Attempt #2."
...
This reverts commit 6fb735b071
2015-03-25 18:27:21 +00:00
e9b15e2ccd
Merge "Switch x86 and x86_64 to 4.9. Attempt #2."
2015-03-25 18:11:54 +00:00
4da707176b
Don't use -Wl,--fix-cortex-a8 for Cortex A7, A9, A15, Krait or Denver
...
-Wl,--fix-cortex-a8 is a workaround for an Erratum in Cortex-A8
processors. It slightly increases code size and decreases performance,
and there's no point in using it on non-A8 CPUs.
Instead of forcing it unconditionally, use it when targeting
Cortex-A8 or generic armv7-a (which might or might not be A8).
Change-Id: Ifa59765d380445237edccfe5440a67b3ba1e459a
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2015-03-25 17:21:02 +01:00
a24a9a8e62
Allow -mcpu=cortex-a15 for clang
...
Clang 3.6 (including the snapshot present in AOSP) added support for
-mcpu=cortex-a15 -- there's no need to fall back to generic armv7-a
anymore.
Change-Id: I8a582261ac35e32f8f1def1d244cf83f2096520d
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2015-03-25 16:59:46 +01:00
cab6699160
MKBOOTIMG override were missing in two places
...
The change follows the patten found in "Package OTA" and other places
to allow for overriding the mkbootimg command.
Now pass MKBOOTIMG variable to get make_recovery_patch and add_image_to_target
to use the tool set in BOARD_CUSTOM_MKBOOTIMG for boot/recovery image
generation.
Change-Id: I78533c25e87c2750eb24ac1bf39e4b7ca321a441
2015-03-25 16:02:50 +01:00
0eabd4f2c5
Support to build image of root file system with /system and ramdisk combined.
...
Added support to build system.img that combines contents of /system and
the ramdisk, and can be mounted at the root of the file system.
To enable this feature, define BoardConfig.mk variable:
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
Ideally we would just change TARGET_OUT (the path of the staging system
directory) to under TARGET_ROOT_OUT. But at this point many places in
the build system assume TARGET_OUT is independent of TARGET_ROOT_OUT and
we can't make it easily configurable.
Instead this implementation takes the least intrusive approach:
We don't change TARGET_OUT or TARGET_ROOT_OUT. We just assemble a
temporary staging directory that contains contents of both TARGET_OUT
and TARGET_ROOT_OUT, in build_image.BuildImage() of
tools/releasetools/build_image.py.
When build_image.py is directly called from the makefile, we pass in the
parameters from the global dictionary; when build_image.BuildImage() is
called from add_img_to_target_files.py, we need to override values to
point to files extracted from the target_files zip file.
We need to combine the fs_config files of both /system and ramdisk,
when fs_config is enabled.
Also this change refactored build_image.BuildImage() by moving the extra
parameters to the image property dictionary.
Bug:19868522
Change-Id: Iafc467a0e3427b0d6ad3b575abcc98ddcc9ea0f1
2015-03-24 21:07:42 -07:00
e84a275061
am 3ba88e7d: am b7fe2e62: am f7683b81: Merge "Clearly explain that 32-bit x86 is not supported"
...
* commit '3ba88e7d2dbc7f4d52202d58614cdcd566539455':
Clearly explain that 32-bit x86 is not supported
2015-03-23 22:55:30 +00:00
0626a6421e
am 783a632f: am 7f914204: am 55fbc49f: Merge "Change eng builds from interpret-only to verify-at-runtime"
...
* commit '783a632f45fdddaa2073445728db61d2041a3435':
Change eng builds from interpret-only to verify-at-runtime
2015-03-23 22:55:28 +00:00
c85af62429
am 743b9f49: am ad54a4da: Add selinux and verity support to custom image generation.
...
* commit '743b9f498b68af1c70eec8e7ca7055a9c23ce6f5':
Add selinux and verity support to custom image generation.
2015-03-23 18:02:30 +00:00
ad54a4dab5
Add selinux and verity support to custom image generation.
...
New custom image configuration variables:
- CUSTOM_IMAGE_SELINUX, set to "true" if the image supports selinux.
- CUSTOM_IMAGE_SUPPORT_VERITY, set to "true" if the product supports verity.
- CUSTOM_IMAGE_VERITY_BLOCK_DEVICE
Also changed the staging directory name to the mount point, like we do
for other images built by the build system.
Bug: 19609718
Change-Id: I6bbf06b79eee63e4c77834f2e6f1d5a7f7e00a12
(cherry picked from commit 7d51a40295
2015-03-23 17:50:16 +00:00
7d51a40295
Add selinux and verity support to custom image generation.
...
New custom image configuration variables:
- CUSTOM_IMAGE_SELINUX, set to "true" if the image supports selinux.
- CUSTOM_IMAGE_SUPPORT_VERITY, set to "true" if the product supports verity.
- CUSTOM_IMAGE_VERITY_BLOCK_DEVICE
Also changed the staging directory name to the mount point, like we do
for other images built by the build system.
Bug: 19609718
Change-Id: I6bbf06b79eee63e4c77834f2e6f1d5a7f7e00a12
2015-03-23 10:04:56 -07:00
91fbe4de46
"LKY80"
2015-03-21 06:05:46 -07:00
3ba88e7d2d
am b7fe2e62: am f7683b81: Merge "Clearly explain that 32-bit x86 is not supported"
...
* commit 'b7fe2e622d7a6a696749d5441358b84569de6f75':
Clearly explain that 32-bit x86 is not supported
2015-03-20 22:09:36 +00:00
b7fe2e622d
am f7683b81: Merge "Clearly explain that 32-bit x86 is not supported"
...
* commit 'f7683b813a7f71313f3dd1f71be1a8ef9d800ebf':
Clearly explain that 32-bit x86 is not supported
2015-03-20 22:02:49 +00:00
783a632f45
am 7f914204: am 55fbc49f: Merge "Change eng builds from interpret-only to verify-at-runtime"
...
* commit '7f91420487936d7916577e163d4f38a4534bb76d':
Change eng builds from interpret-only to verify-at-runtime
2015-03-20 21:58:48 +00:00
f7683b813a
Merge "Clearly explain that 32-bit x86 is not supported"
2015-03-20 21:52:38 +00:00
7f91420487
am 55fbc49f: Merge "Change eng builds from interpret-only to verify-at-runtime"
...
* commit '55fbc49fe1993d87a6a978132c827f316f2be5a7':
Change eng builds from interpret-only to verify-at-runtime
2015-03-20 21:26:39 +00:00
55fbc49fe1
Merge "Change eng builds from interpret-only to verify-at-runtime"
2015-03-20 21:19:40 +00:00
2cd8a74b2d
Clearly explain that 32-bit x86 is not supported
...
Change-Id: I7f352fae8fa3742c61dc74e20aacd32254451bce
2015-03-20 12:50:42 -07:00
62a7cac50d
Change eng builds from interpret-only to verify-at-runtime
...
Faster dex2oat -> faster boot after syncing core libraries.
Bug: 19762303
Change-Id: Ic266ed9c59829e0e18acc4adc103724cf480de7f
2015-03-20 11:15:20 -07:00
ec46a3b71f
Turn off Jack warnings by default
...
Change-Id: I24b3135395483b3581d212cb2ab1bb93ba2524d9
2015-03-20 15:40:07 +01:00
6fb735b071
Switch x86 and x86_64 to 4.9. Attempt #2 .
...
BUG=16407835
Change-Id: I45161bf4701bef4540b51168f771c5e9da8c8750
Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com>
2015-03-20 17:07:34 +03:00
e6a3ff8d52
am ad3f2ee0: am f1999c8a: am 59112a2d: Merge "Static binaries with libc++ need libs c, m and dl."
...
* commit 'ad3f2ee0dfbd8d63ffa81d4bb126c7d2cfaded2b':
Static binaries with libc++ need libs c, m and dl.
2015-03-20 03:29:23 +00:00
ad3f2ee0df
am f1999c8a: am 59112a2d: Merge "Static binaries with libc++ need libs c, m and dl."
...
* commit 'f1999c8af022d295397d2c1079dbebf362d9ad37':
Static binaries with libc++ need libs c, m and dl.
2015-03-20 03:23:48 +00:00
f1999c8af0
am 59112a2d: Merge "Static binaries with libc++ need libs c, m and dl."
...
* commit '59112a2da30004b20c186e0878148cd6053ae859':
Static binaries with libc++ need libs c, m and dl.
2015-03-20 03:14:17 +00:00
59112a2da3
Merge "Static binaries with libc++ need libs c, m and dl."
2015-03-20 03:04:20 +00:00
7e44d7febf
Filter out gcc only flags.
...
They are currently used in some vendor projects.
Change-Id: Iff30966cba3b2941a8921cc35bb3ed1e4fea0bad
2015-03-19 15:17:06 -07:00
7955bf0fd6
Static binaries with libc++ need libs c, m and dl.
...
Can't be done on the user's end because these libraries all need to be
linked after libc++_static.
Change-Id: Ib21364e6f43689cf59da31d6f561919731ef8272
2015-03-19 13:05:13 -07:00
eda38d7718
am b01a4ca3: am 68f6e305: am 9682e56a: Merge "Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit""
...
* commit 'b01a4ca3c838007d2e8f71c01b37f8e878cff686':
Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
2015-03-19 17:06:47 +00:00
b01a4ca3c8
am 68f6e305: am 9682e56a: Merge "Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit""
...
* commit '68f6e30521feced2dbd2e1dcb606f9f15cf5ec21':
Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
2015-03-19 16:59:02 +00:00
68f6e30521
am 9682e56a: Merge "Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit""
...
* commit '9682e56a794f2fc68cae00475b7f11927c57b3da':
Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
2015-03-19 16:51:34 +00:00
8b11285dd9
Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
...
Bug: 19735273
This reverts commit 3abfcfc17b
2015-03-18 19:06:28 -07:00
820fe32d46
Store odex files in oat/<isa>/ directory.
...
Previously odex files were stored alongside the dex location as:
dex location: /foo/bar/base.apk
odex location: /foo/bar/<isa>/base.odex
This changes where odex files are stored, adding an "oat" directory:
dex location: /foo/bar/base.apk
odex location: /foo/bar/oat/<isa>/base.odex
See also the corresponding change in platform/art and
platform/frameworks/native.
Bug: 19550105
Change-Id: I4c6be4f0c41ff175904846db8e360c4af815b265
2015-03-18 12:41:31 -07:00
12f28287dc
Merge "Use java -jar ... instead of java -cp ..."
2015-03-17 17:34:27 +00:00
76a5e0bd1a
Use java -jar ... instead of java -cp ...
...
When running Jack or Jill.
Change-Id: I2127f183f8f033a9d35a7e8247a9432252a58bc8
2015-03-17 17:03:22 +01:00
7c2d49dcb9
am 7b93109e: am d7f3d8ba: am 8ca542f4: Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
...
* commit '7b93109e48f90f756228bfe399b67d5d8cc306b0':
Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
2015-03-17 14:47:31 +00:00
7b93109e48
am d7f3d8ba: am 8ca542f4: Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
...
* commit 'd7f3d8ba74c25c80fcb5032e6b59e121e5546f98':
Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
2015-03-17 14:41:15 +00:00
e088179677
am 8081a8b5: am 13169ccb: Merge "Revert "Switch x86 and x86_64 build to use GCC 4.9""
...
* commit '8081a8b5960055c12ad50ba9a8651fe3adb4b370':
Revert "Switch x86 and x86_64 build to use GCC 4.9"
2015-03-17 14:41:13 +00:00
d7f3d8ba74
am 8ca542f4: Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
...
* commit '8ca542f4394affd420271d8df946e199449508e6':
Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
2015-03-17 14:32:51 +00:00
8081a8b596
am 13169ccb: Merge "Revert "Switch x86 and x86_64 build to use GCC 4.9""
...
* commit '13169ccba2d9e11e311babd8fc80f41c610c753e':
Revert "Switch x86 and x86_64 build to use GCC 4.9"
2015-03-17 14:32:50 +00:00
1a97c05380
Revert "Switch x86 and x86_64 build to use GCC 4.9"
...
This reverts commit 533c7aa6a2f123057f5e
2015-03-16 18:32:54 -07:00
13169ccba2
Merge "Revert "Switch x86 and x86_64 build to use GCC 4.9""
2015-03-17 01:31:16 +00:00
f123057f5e
Revert "Switch x86 and x86_64 build to use GCC 4.9"
...
This reverts commit 533c7aa6a2
2015-03-17 01:29:51 +00:00
a9ee744457
am 58b2f1e3: am 81f7dee7: am bf0b6df4: Merge "Switch x86 and x86_64 build to use GCC 4.9"
...
* commit '58b2f1e320a9682871cd4f7e4379c8bf167a2204':
Switch x86 and x86_64 build to use GCC 4.9
2015-03-17 00:13:55 +00:00
58b2f1e320
am 81f7dee7: am bf0b6df4: Merge "Switch x86 and x86_64 build to use GCC 4.9"
...
* commit '81f7dee74cc436fa47339a884467cc241dd86dc7':
Switch x86 and x86_64 build to use GCC 4.9
2015-03-17 00:07:39 +00:00
81f7dee74c
am bf0b6df4: Merge "Switch x86 and x86_64 build to use GCC 4.9"
...
* commit 'bf0b6df4c15c2e7bbfd3a8b84d7c627cc3b7127f':
Switch x86 and x86_64 build to use GCC 4.9
2015-03-16 23:59:04 +00:00
bf0b6df4c1
Merge "Switch x86 and x86_64 build to use GCC 4.9"
2015-03-16 23:50:19 +00:00
3abfcfc17b
Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
...
Bug: 19735273
Change-Id: Ia0d748b511230f5e0c7d0763de3abeab9d6e0ca7
2015-03-16 16:29:30 -07:00
2219b1d8ef
am efc3a220: am d73696c1: Merge "Load cts/build/config.mk after build/core/config.mk"
...
* commit 'efc3a22009b15c389041427f8c74f551243b60d0':
Load cts/build/config.mk after build/core/config.mk
2015-03-16 19:07:43 +00:00
efc3a22009
am d73696c1: Merge "Load cts/build/config.mk after build/core/config.mk"
...
* commit 'd73696c1fefface6f3d2311d1dead3afae01b048':
Load cts/build/config.mk after build/core/config.mk
2015-03-16 19:01:59 +00:00
e9f0226655
Apply jack redirection flag to also custom ANDROID_JACK_EXTRA_ARGS
...
Bug: 19715777
Change-Id: I4ad9c9f51bf418afe29f5a682f630d6071cd33a2
2015-03-16 11:59:41 -07:00
f738b3bb9f
Load cts/build/config.mk after build/core/config.mk
...
So that the cts config.mk can use global variables set by the core build
system config.mk.
Change-Id: I2571564abbb53257eee54485a3357ab1305eb870
(cherry picked from commit bacf5f8008
2015-03-16 10:56:03 -07:00
1ccaa8fbd8
Merge "Make Jack use tmp dir specified by TMPDIR"
2015-03-16 17:08:01 +00:00
f528e132d6
Make Jack use tmp dir specified by TMPDIR
...
If the environment variable is defined.
Bug: 19654122
Change-Id: Ib238a2c2eb60296a96de98a4a54e0996d4c8a958
2015-03-16 15:59:33 +01:00
f252faae65
Merge "Redirect jack warnings to stdout"
2015-03-16 14:06:29 +00:00
533c7aa6a2
Switch x86 and x86_64 build to use GCC 4.9
...
Change-Id: I41a7650d0e56c820a59c261d16afd6f0b9ec38c2
2015-03-16 13:17:59 +08:00
d4ca3b38d9
am 4cbc4b39: am ae61f50a: Support to configure and build multiple custom images.
...
* commit '4cbc4b392da57c34626af38a4ea0fe4dc115af57':
Support to configure and build multiple custom images.
2015-03-14 00:31:44 +00:00
ae61f50a68
Support to configure and build multiple custom images.
...
Build additional images requested by the product makefile.
This script gives the ability to build multiple additional images and
you can configure what modules/files to include in each image.
1. Define PRODUCT_CUSTOM_IMAGE_MAKEFILES in your product makefile.
PRODUCT_CUSTOM_IMAGE_MAKEFILES is a list of makefiles.
Each makefile configures an image.
For image configuration makefile foo/bar/xyz.mk, the built image
file name
will be xyz.img. So make sure they won't conflict.
2. In each image's configuration makefile, you can define variables:
- CUSTOM_IMAGE_MOUNT_POINT, the mount point, such as "oem", "odm"
etc.
- CUSTOM_IMAGE_PARTITION_SIZE
- CUSTOM_IMAGE_FILE_SYSTEM_TYPE
- CUSTOM_IMAGE_DICT_FILE, a text file defining a dictionary
accepted by BuildImage() in tools/releasetools/build_image.py.
- CUSTOM_IMAGE_MODULES, a list of module names you want to include
in the image; Not only the module itself will be installed to proper
path in the image, you can also piggyback additional files/directories
with the module's LOCAL_PICKUP_FILES.
- CUSTOM_IMAGE_COPY_FILES, a list of "<src>:<dest>" to be copied to
the image. <dest> is relativ to the root of the image.
To build all those images, run "make custom_images".
Bug: 19609718
Change-Id: Ic73587e08503a251be27797c7b00329716051927
(cherry picked from commit 5fcf1094f9
2015-03-14 00:06:54 +00:00
7c4a530666
Merge "Support to configure and build multiple custom images."
2015-03-13 23:55:28 +00:00
Nick Kralevich