OSDN Git Service
Ying Wang [Wed, 25 Mar 2015 18:58:52 +0000 (18:58 +0000)]
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.
Ying Wang [Wed, 25 Mar 2015 18:50:07 +0000 (18:50 +0000)]
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.
Ying Wang [Wed, 25 Mar 2015 18:11:54 +0000 (18:11 +0000)]
Merge "Switch x86 and x86_64 to 4.9. Attempt #2."
Dan Albert [Tue, 24 Mar 2015 00:18:47 +0000 (00:18 +0000)]
am
c47f47b7: am
5d60719e: Merge "Run ZipFile.testzip() during zipfile tests."
* commit '
c47f47b74f6ed6daa83e3f4357cf315a4b617f6e':
Run ZipFile.testzip() during zipfile tests.
Dan Albert [Tue, 24 Mar 2015 00:12:27 +0000 (00:12 +0000)]
am
5d60719e: Merge "Run ZipFile.testzip() during zipfile tests."
* commit '
5d60719e42fdc0d007920d946f1c1bb440cedab7':
Run ZipFile.testzip() during zipfile tests.
Dan Albert [Tue, 24 Mar 2015 00:07:01 +0000 (00:07 +0000)]
Merge "Run ZipFile.testzip() during zipfile tests."
Tao Bao [Mon, 23 Mar 2015 23:58:49 +0000 (23:58 +0000)]
am
2d139fcf: am
0488079d: Merge "Fix the computation of basefilename"
* commit '
2d139fcf2916ad6d0008cf32a2fc1c2899eda3ff':
Fix the computation of basefilename
Tao Bao [Mon, 23 Mar 2015 23:54:55 +0000 (23:54 +0000)]
am
0488079d: Merge "Fix the computation of basefilename"
* commit '
0488079dfa5d5e53198125934eeaefa9cf1e7047':
Fix the computation of basefilename
Dan Albert [Mon, 23 Mar 2015 23:54:39 +0000 (16:54 -0700)]
Run ZipFile.testzip() during zipfile tests.
This still doesn't catch the issue that [1] fixes, but it's probably a
good idea anyway.
[1]: https://android-review.googlesource.com/#/c/143469/
Change-Id: Iaa607ec7450d605b26114bd81ea41a14c6613c0e
Tao Bao [Mon, 23 Mar 2015 23:48:59 +0000 (23:48 +0000)]
Merge "Fix the computation of basefilename"
Tao Bao [Mon, 23 Mar 2015 23:01:17 +0000 (16:01 -0700)]
Fix the computation of basefilename
Change-Id: I156b182414ef5b33611955cbc019e208c771013a
Greg Hackmann [Mon, 23 Mar 2015 22:03:08 +0000 (22:03 +0000)]
am
9f201b18: am
088521ef: Merge "Allow system images larger than 2GiB, pt. 2"
* commit '
9f201b18be8a4cecd27d7b5635c0892fbb00c591':
Allow system images larger than 2GiB, pt. 2
Greg Hackmann [Mon, 23 Mar 2015 21:55:50 +0000 (21:55 +0000)]
am
088521ef: Merge "Allow system images larger than 2GiB, pt. 2"
* commit '
088521ef906346e06ce39c877ff142c2467e3a79':
Allow system images larger than 2GiB, pt. 2
Greg Hackmann [Mon, 23 Mar 2015 21:49:31 +0000 (21:49 +0000)]
Merge "Allow system images larger than 2GiB, pt. 2"
Greg Hackmann [Mon, 23 Mar 2015 21:05:50 +0000 (14:05 -0700)]
Allow system images larger than 2GiB, pt. 2
We need to patch zipfile during close() too, because it refers to the
ZIP64 file size threshold when writing out the central directory
Bug:
18015246
Bug:
19888174
Change-Id: I1b49d653d0831fcc2106808f86c929d7a2b22ff3
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Ying Wang [Mon, 23 Mar 2015 18:02:30 +0000 (18:02 +0000)]
am
743b9f49: am
ad54a4da: Add selinux and verity support to custom image generation.
* commit '
743b9f498b68af1c70eec8e7ca7055a9c23ce6f5':
Add selinux and verity support to custom image generation.
Ying Wang [Mon, 23 Mar 2015 17:55:09 +0000 (17:55 +0000)]
am
ad54a4da: Add selinux and verity support to custom image generation.
* commit '
ad54a4dab520d84f76c9ad6a83be92b5563de24e':
Add selinux and verity support to custom image generation.
Ying Wang [Sat, 21 Mar 2015 00:43:02 +0000 (17:43 -0700)]
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
7d51a4029590b58e22071eed919d59a0ff205bef)
Tao Bao [Mon, 23 Mar 2015 03:43:30 +0000 (03:43 +0000)]
am
62eed4d8: am
b5901670: Merge "Fix the syntax error in the edify script generator"
* commit '
62eed4d8a9eb71181965e38dacabd13cee091da2':
Fix the syntax error in the edify script generator
Tao Bao [Mon, 23 Mar 2015 03:35:56 +0000 (03:35 +0000)]
am
b5901670: Merge "Fix the syntax error in the edify script generator"
* commit '
b59016703a540a541a94e352c1ef54442a0e95dd':
Fix the syntax error in the edify script generator
Tao Bao [Mon, 23 Mar 2015 03:29:58 +0000 (03:29 +0000)]
Merge "Fix the syntax error in the edify script generator"
Tao Bao [Sun, 22 Mar 2015 21:20:48 +0000 (14:20 -0700)]
Fix the syntax error in the edify script generator
file_getprop() always expects two arguments.
Bug:
19881931
Change-Id: Icf5577ad34188991c03f68c1217642d3adc4201c
Brian Carlstrom [Fri, 20 Mar 2015 22:09:36 +0000 (22:09 +0000)]
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
Brian Carlstrom [Fri, 20 Mar 2015 22:02:49 +0000 (22:02 +0000)]
am
f7683b81: Merge "Clearly explain that 32-bit x86 is not supported"
* commit '
f7683b813a7f71313f3dd1f71be1a8ef9d800ebf':
Clearly explain that 32-bit x86 is not supported
Mathieu Chartier [Fri, 20 Mar 2015 21:58:48 +0000 (21:58 +0000)]
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
Brian Carlstrom [Fri, 20 Mar 2015 21:52:38 +0000 (21:52 +0000)]
Merge "Clearly explain that 32-bit x86 is not supported"
Mathieu Chartier [Fri, 20 Mar 2015 21:26:39 +0000 (21:26 +0000)]
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
Paul Miller [Fri, 20 Mar 2015 21:24:37 +0000 (21:24 +0000)]
am
23588104: am
971e5787: Merge "Revert "Replace legacy Browser with BookmarkProvider""
* commit '
23588104d5659ea797666c10a63a9b2c7ba8a09c':
Revert "Replace legacy Browser with BookmarkProvider"
Mathieu Chartier [Fri, 20 Mar 2015 21:19:40 +0000 (21:19 +0000)]
Merge "Change eng builds from interpret-only to verify-at-runtime"
Paul Miller [Fri, 20 Mar 2015 21:16:47 +0000 (21:16 +0000)]
am
971e5787: Merge "Revert "Replace legacy Browser with BookmarkProvider""
* commit '
971e5787c0ebaa35f238bb99433cbfefd0bab50d':
Revert "Replace legacy Browser with BookmarkProvider"
Paul Miller [Fri, 20 Mar 2015 21:08:49 +0000 (21:08 +0000)]
Merge "Revert "Replace legacy Browser with BookmarkProvider""
Ying Wang [Fri, 20 Mar 2015 20:41:09 +0000 (20:41 +0000)]
am
00391a43: am
082184e7: Merge "Bump generic_arm64 system partition size."
* commit '
00391a43166a4271ad2471adffb75849be1984a8':
Bump generic_arm64 system partition size.
Ying Wang [Fri, 20 Mar 2015 20:34:40 +0000 (20:34 +0000)]
am
082184e7: Merge "Bump generic_arm64 system partition size."
* commit '
082184e741232181f7b66d800142ef62dacbf765':
Bump generic_arm64 system partition size.
Ying Wang [Fri, 20 Mar 2015 20:29:52 +0000 (20:29 +0000)]
Merge "Bump generic_arm64 system partition size."
Ying Wang [Fri, 20 Mar 2015 20:29:10 +0000 (13:29 -0700)]
Bump generic_arm64 system partition size.
Change-Id: Ic53fdaa0143ee2c0cce5a2f750da4c52adc6fdb9
Brian Carlstrom [Fri, 20 Mar 2015 18:39:00 +0000 (11:39 -0700)]
Clearly explain that 32-bit x86 is not supported
Change-Id: I7f352fae8fa3742c61dc74e20aacd32254451bce
Mathieu Chartier [Thu, 19 Mar 2015 17:34:23 +0000 (10:34 -0700)]
Change eng builds from interpret-only to verify-at-runtime
Faster dex2oat -> faster boot after syncing core libraries.
Bug:
19762303
Change-Id: Ic266ed9c59829e0e18acc4adc103724cf480de7f
Ying Wang [Fri, 20 Mar 2015 17:10:51 +0000 (17:10 +0000)]
am
b9583756: am
8e52e15d: Merge "Bump generic_mips system partition size."
* commit '
b9583756eecda3dbad41b83fcba51ef7c07ac907':
Bump generic_mips system partition size.
Ying Wang [Fri, 20 Mar 2015 17:05:06 +0000 (17:05 +0000)]
am
8e52e15d: Merge "Bump generic_mips system partition size."
* commit '
8e52e15debb587e85915482ddb7464fb0429a6bb':
Bump generic_mips system partition size.
Paul Miller [Fri, 20 Mar 2015 16:26:26 +0000 (16:26 +0000)]
Revert "Replace legacy Browser with BookmarkProvider"
This reverts commit
61690224177c7ff4c95fa3b163fd7b9c4c82c4a3.
Change-Id: I0246ef7a89de08bc449509b39f8db8279ea0871e
BUG:
19351071
Ying Wang [Fri, 20 Mar 2015 16:20:00 +0000 (16:20 +0000)]
Merge "Bump generic_mips system partition size."
Ying Wang [Fri, 20 Mar 2015 16:18:33 +0000 (09:18 -0700)]
Bump generic_mips system partition size.
Change-Id: Ieb3becc3ddc1efa19c6e6d34b4a31c0440d3479d
Alexander Ivchenko [Fri, 20 Mar 2015 14:07:34 +0000 (17:07 +0300)]
Switch x86 and x86_64 to 4.9. Attempt #2.
BUG=
16407835
Change-Id: I45161bf4701bef4540b51168f771c5e9da8c8750
Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com>
Narayan Kamath [Fri, 20 Mar 2015 09:17:35 +0000 (09:17 +0000)]
am
2002102e: am
ad22a8f2: Merge "Remove VoiceDialer from PRODUCT_PACKAGE list."
* commit '
2002102e36e96377849f708c4e1afe3c536763f8':
Remove VoiceDialer from PRODUCT_PACKAGE list.
Narayan Kamath [Fri, 20 Mar 2015 09:11:17 +0000 (09:11 +0000)]
am
ad22a8f2: Merge "Remove VoiceDialer from PRODUCT_PACKAGE list."
* commit '
ad22a8f2a71209d0fec3c49bdd688678a3412540':
Remove VoiceDialer from PRODUCT_PACKAGE list.
Narayan Kamath [Fri, 20 Mar 2015 08:53:08 +0000 (08:53 +0000)]
Merge "Remove VoiceDialer from PRODUCT_PACKAGE list."
Tao Bao [Fri, 20 Mar 2015 03:27:55 +0000 (03:27 +0000)]
am
ae978751: am
261e195d: Merge "Make the generated OTAs repeatable"
* commit '
ae9787514d5709dff766f4791c00a4875eebbf50':
Make the generated OTAs repeatable
Dan Albert [Fri, 20 Mar 2015 03:23:48 +0000 (03:23 +0000)]
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.
Tao Bao [Fri, 20 Mar 2015 03:18:43 +0000 (03:18 +0000)]
am
261e195d: Merge "Make the generated OTAs repeatable"
* commit '
261e195dacde109d4b438d8af3e370c87b162a5d':
Make the generated OTAs repeatable
Dan Albert [Fri, 20 Mar 2015 03:14:17 +0000 (03:14 +0000)]
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.
Tao Bao [Fri, 20 Mar 2015 03:09:41 +0000 (03:09 +0000)]
Merge "Make the generated OTAs repeatable"
Dan Albert [Fri, 20 Mar 2015 03:04:19 +0000 (03:04 +0000)]
Merge "Static binaries with libc++ need libs c, m and dl."
Tao Bao [Fri, 20 Mar 2015 02:42:12 +0000 (19:42 -0700)]
Make the generated OTAs repeatable
The generated OTAs are supposed to be repeatable. The use of dict in
blockimgdiff.py breaks the assumption for block-based OTAs. Fixed by
using OrderedDict instead.
Change-Id: I945bdc879912ba174ca330c152b1f8fc7ed211ac
Tao Bao [Thu, 19 Mar 2015 21:24:59 +0000 (21:24 +0000)]
am
fc267120: am
b7e5ab6f: Merge "Allow system images larger than 2GiB."
* commit '
fc2671201caeac485440c2aa146f35a99002bca2':
Allow system images larger than 2GiB.
Tao Bao [Thu, 19 Mar 2015 21:17:32 +0000 (21:17 +0000)]
am
b7e5ab6f: Merge "Allow system images larger than 2GiB."
* commit '
b7e5ab6fbd4e573515c30772ac813a5fc4bce680':
Allow system images larger than 2GiB.
Tao Bao [Thu, 19 Mar 2015 21:10:54 +0000 (21:10 +0000)]
Merge "Allow system images larger than 2GiB."
Dan Albert [Tue, 27 Jan 2015 23:53:15 +0000 (15:53 -0800)]
Allow system images larger than 2GiB.
Python 2.7's zipfile implementation wrongly thinks that zip64 is
required for files larger than 2GiB. We can work around this by
adjusting their limit. Note that `zipfile.writestr()` will not work
for strings larger than 2GiB. The Python interpreter sometimes rejects
strings that large (though it isn't clear to me exactly what
circumstances cause this). `zipfile.write()` must be used directly to
work around this.
This mess can be avoided if we port to python3.
The bug (b/
19364241) in original commit has been fixed.
Bug:
18015246
Bug:
19364241
Bug:
19839468
(cherry picked from commit
cd082d4bfe917b2e6b97436839cbbbc67c733c83)
Change-Id: I7b5cc310e0a9ba894533b53cb998afd5ce96d8c6
Paul Miller [Thu, 19 Mar 2015 20:35:10 +0000 (20:35 +0000)]
am
e601f1ec: am
d121f184: Merge "Replace legacy Browser with BookmarkProvider"
* commit '
e601f1ecfd9ba938053b6763124ea1359efeddbe':
Replace legacy Browser with BookmarkProvider
Paul Miller [Thu, 19 Mar 2015 20:28:29 +0000 (20:28 +0000)]
am
d121f184: Merge "Replace legacy Browser with BookmarkProvider"
* commit '
d121f18450520c4869a807533b4abf1adb1e846c':
Replace legacy Browser with BookmarkProvider
Paul Miller [Thu, 19 Mar 2015 20:23:22 +0000 (20:23 +0000)]
Merge "Replace legacy Browser with BookmarkProvider"
Dan Albert [Thu, 19 Mar 2015 20:05:13 +0000 (13:05 -0700)]
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
Narayan Kamath [Fri, 13 Mar 2015 17:16:07 +0000 (17:16 +0000)]
Remove VoiceDialer from PRODUCT_PACKAGE list.
Change-Id: Ibc86ddee90a9ff83c3cdcbf086a6a1e466ba5088
Mathieu Chartier [Thu, 19 Mar 2015 16:59:02 +0000 (16:59 +0000)]
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"
Mathieu Chartier [Thu, 19 Mar 2015 16:51:34 +0000 (16:51 +0000)]
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"
Mathieu Chartier [Thu, 19 Mar 2015 16:44:55 +0000 (16:44 +0000)]
Merge "Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit""
Justin Morey [Thu, 19 Mar 2015 03:00:29 +0000 (03:00 +0000)]
am
292427b6: am
030b5493: resolved conflicts for merge of
68000907 to lmp-mr1-dev
* commit '
292427b69f7b1a753c0636f916382e2a4f9648ba':
Bump generic_x86_64 system partition size - DO NOT MERGE
Justin Morey [Thu, 19 Mar 2015 02:47:00 +0000 (02:47 +0000)]
am
030b5493: resolved conflicts for merge of
68000907 to lmp-mr1-dev
* commit '
030b5493147d47a726e9f3e0e474772b29ad3111':
Bump generic_x86_64 system partition size - DO NOT MERGE
Justin Morey [Thu, 19 Mar 2015 02:27:17 +0000 (21:27 -0500)]
resolved conflicts for merge of
68000907 to lmp-mr1-dev
Change-Id: I9f1a80746a5d945c704cd126efebca0941e27e47
Mathieu Chartier [Thu, 19 Mar 2015 01:52:40 +0000 (18:52 -0700)]
Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
Bug:
19735273
This reverts commit
3abfcfc17b022a5af9d37403f81fae027ab850b9.
Change-Id: Iac930925ab6d5cd5947fa4077c8d93e2984927d5
Justin Morey [Wed, 18 Mar 2015 23:00:33 +0000 (23:00 +0000)]
am
02060b7b: Bump generic_x86_64 system partition size - DO NOT MERGE
* commit '
02060b7bddbb8728fa5a4ba5e0905e5a173bc682':
Bump generic_x86_64 system partition size - DO NOT MERGE
Paul Miller [Wed, 18 Mar 2015 22:26:15 +0000 (15:26 -0700)]
Replace legacy Browser with BookmarkProvider
BookmarkProvider is Browser's old provider code, refactored into its
own app.
BUG:
19351071
Change-Id: I0a5e1f2fc54749e2d3e3442636a26b2459b600c6
Justin Morey [Wed, 18 Mar 2015 19:57:16 +0000 (14:57 -0500)]
Bump generic_x86_64 system partition size - DO NOT MERGE
This makes it big enough to hold Orla, unbreaking the build
Change-Id: I5a131dfbaaa3aa2bb1bc24e4f859cc3507b671b0
Mathieu Chartier [Tue, 17 Mar 2015 14:41:15 +0000 (14:41 +0000)]
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
Christopher Ferris [Tue, 17 Mar 2015 14:41:13 +0000 (14:41 +0000)]
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"
Elliott Hughes [Tue, 17 Mar 2015 14:41:12 +0000 (14:41 +0000)]
am
47584657: am
0f98a378: Merge "Remove netcfg from the list of base modules."
* commit '
475846579e99aaeeddaaaf23c67435b6daca13e2':
Remove netcfg from the list of base modules.
Mathieu Chartier [Tue, 17 Mar 2015 14:32:51 +0000 (14:32 +0000)]
am
8ca542f4: Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
* commit '
8ca542f4394affd420271d8df946e199449508e6':
Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
Christopher Ferris [Tue, 17 Mar 2015 14:32:50 +0000 (14:32 +0000)]
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"
Elliott Hughes [Tue, 17 Mar 2015 14:32:48 +0000 (14:32 +0000)]
am
0f98a378: Merge "Remove netcfg from the list of base modules."
* commit '
0f98a3781c4fab57bdd696cca3edd6614d65abe6':
Remove netcfg from the list of base modules.
Mathieu Chartier [Tue, 17 Mar 2015 02:04:41 +0000 (02:04 +0000)]
Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
Christopher Ferris [Tue, 17 Mar 2015 01:31:16 +0000 (01:31 +0000)]
Merge "Revert "Switch x86 and x86_64 build to use GCC 4.9""
Christopher Ferris [Tue, 17 Mar 2015 01:29:51 +0000 (01:29 +0000)]
Revert "Switch x86 and x86_64 build to use GCC 4.9"
This reverts commit
533c7aa6a293659541222f0dd89bee044ba71a2a.
Change-Id: I5203db8454d9af8fb438af6308106945e5dc0dbf
Elliott Hughes [Tue, 17 Mar 2015 00:58:29 +0000 (00:58 +0000)]
Merge "Remove netcfg from the list of base modules."
Andrew Hsieh [Tue, 17 Mar 2015 00:07:39 +0000 (00:07 +0000)]
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
Andrew Hsieh [Mon, 16 Mar 2015 23:59:04 +0000 (23:59 +0000)]
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
Andrew Hsieh [Mon, 16 Mar 2015 23:50:18 +0000 (23:50 +0000)]
Merge "Switch x86 and x86_64 build to use GCC 4.9"
Mathieu Chartier [Mon, 16 Mar 2015 23:14:56 +0000 (16:14 -0700)]
Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
Bug:
19735273
Change-Id: Ia0d748b511230f5e0c7d0763de3abeab9d6e0ca7
Elliott Hughes [Mon, 16 Mar 2015 20:52:30 +0000 (13:52 -0700)]
Remove netcfg from the list of base modules.
It's obsolete and -- other than a mention in the reference RIL and
another in a shell script that no longer works -- unused.
Change-Id: Ibbf2613778802222865528644c7e59a2d7c68b48
Ying Wang [Mon, 16 Mar 2015 19:07:43 +0000 (19:07 +0000)]
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
Ying Wang [Mon, 16 Mar 2015 19:01:59 +0000 (19:01 +0000)]
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
Ying Wang [Mon, 16 Mar 2015 18:57:37 +0000 (18:57 +0000)]
Merge "Load cts/build/config.mk after build/core/config.mk"
Ying Wang [Fri, 13 Feb 2015 18:28:40 +0000 (10:28 -0800)]
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
bacf5f8008e4361d810895dd251354ac348cbf27)
Andrew Hsieh [Fri, 13 Jun 2014 20:16:13 +0000 (13:16 -0700)]
Switch x86 and x86_64 build to use GCC 4.9
Change-Id: I41a7650d0e56c820a59c261d16afd6f0b9ec38c2
Tao Bao [Sat, 14 Mar 2015 05:40:38 +0000 (22:40 -0700)]
resolved conflicts for merge of
6502ae93 to lmp-mr1-dev-plus-aosp
Change-Id: I3ffed7f5a32363d5a4481eebddff8feff3c4ebee
Tao Bao [Sat, 14 Mar 2015 05:08:38 +0000 (05:08 +0000)]
am
18b27966: Merge "Restrict the verification in block-based incremental OTAs"
* commit '
18b27966a66a27da7b7199ab3e4351e9369cf060':
Restrict the verification in block-based incremental OTAs
Tao Bao [Sat, 14 Mar 2015 05:01:33 +0000 (05:01 +0000)]
Merge "Restrict the verification in block-based incremental OTAs"
Tao Bao [Thu, 12 Mar 2015 19:32:37 +0000 (12:32 -0700)]
Restrict the verification in block-based incremental OTAs
BlockImageDiff has three versions. Only the incremental OTAs generated
with the latest version (3) can be re-applied to the system that's
already on the target build. Otherwise, operations like move will make
unconditional changes and damage the system. During the verification
phase, abort the OTA update if BlockImageDiff is less than 3 and it
doesn't match the checksum of the source build.
Change-Id: Ic630346eab2a993a84d0aeaacd7167ef62cc24f6
(cherry picked from commit
daebaa6ed3fbf4e7943e6c8290ec6b9233b542e9)
Ying Wang [Sat, 14 Mar 2015 00:31:44 +0000 (00:31 +0000)]
am
4cbc4b39: am
ae61f50a: Support to configure and build multiple custom images.
* commit '
4cbc4b392da57c34626af38a4ea0fe4dc115af57':
Support to configure and build multiple custom images.
Ying Wang [Sat, 14 Mar 2015 00:17:52 +0000 (00:17 +0000)]
am
ae61f50a: Support to configure and build multiple custom images.
* commit '
ae61f50a680d4a8e91274b35305dc2e24959abbe':
Support to configure and build multiple custom images.
Ying Wang [Fri, 13 Mar 2015 01:30:39 +0000 (18:30 -0700)]
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
5fcf1094f9cf4d57c2598237f99621f254130d71)
Dan Albert [Fri, 13 Mar 2015 23:29:06 +0000 (23:29 +0000)]
am
c37d7043: am
3ad14218: Merge "Strip prebuilt shared library by default."
* commit '
c37d7043e6fde29bf14218c31132dc48a9f7e995':
Strip prebuilt shared library by default.