Dan Albert
5d60719e42
Merge "Run ZipFile.testzip() during zipfile tests."
2015-03-24 00:07:02 +00:00
Tao Bao
3e88a16b0e
am 2d139fcf
: am 0488079d
: Merge "Fix the computation of basefilename"
...
* commit '2d139fcf2916ad6d0008cf32a2fc1c2899eda3ff':
Fix the computation of basefilename
2015-03-23 23:58:49 +00:00
Tao Bao
2d139fcf29
am 0488079d
: Merge "Fix the computation of basefilename"
...
* commit '0488079dfa5d5e53198125934eeaefa9cf1e7047':
Fix the computation of basefilename
2015-03-23 23:54:55 +00:00
Dan Albert
d6d1beb88c
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
2015-03-23 16:54:39 -07:00
Tao Bao
0488079dfa
Merge "Fix the computation of basefilename"
2015-03-23 23:49:00 +00:00
Tao Bao
eaf885b1d0
Fix the computation of basefilename
...
Change-Id: I156b182414ef5b33611955cbc019e208c771013a
2015-03-23 16:05:26 -07:00
Greg Hackmann
3b88235d04
am 9f201b18
: am 088521ef
: Merge "Allow system images larger than 2GiB, pt. 2"
...
* commit '9f201b18be8a4cecd27d7b5635c0892fbb00c591':
Allow system images larger than 2GiB, pt. 2
2015-03-23 22:03:08 +00:00
Greg Hackmann
9f201b18be
am 088521ef
: Merge "Allow system images larger than 2GiB, pt. 2"
...
* commit '088521ef906346e06ce39c877ff142c2467e3a79':
Allow system images larger than 2GiB, pt. 2
2015-03-23 21:55:50 +00:00
Greg Hackmann
088521ef90
Merge "Allow system images larger than 2GiB, pt. 2"
2015-03-23 21:49:31 +00:00
Greg Hackmann
6701db8145
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 >
2015-03-23 14:35:50 -07:00
Ying Wang
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
Ying Wang
743b9f498b
am ad54a4da
: Add selinux and verity support to custom image generation.
...
* commit 'ad54a4dab520d84f76c9ad6a83be92b5563de24e':
Add selinux and verity support to custom image generation.
2015-03-23 17:55:09 +00:00
Ying Wang
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
Tao Bao
45aece2233
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
2015-03-23 03:43:30 +00:00
Tao Bao
62eed4d8a9
am b5901670
: Merge "Fix the syntax error in the edify script generator"
...
* commit 'b59016703a540a541a94e352c1ef54442a0e95dd':
Fix the syntax error in the edify script generator
2015-03-23 03:35:56 +00:00
Tao Bao
b59016703a
Merge "Fix the syntax error in the edify script generator"
2015-03-23 03:29:58 +00:00
Tao Bao
3910ebf468
Fix the syntax error in the edify script generator
...
file_getprop() always expects two arguments.
Bug: 19881931
Change-Id: Icf5577ad34188991c03f68c1217642d3adc4201c
2015-03-22 14:20:48 -07:00
The Android Automerger
91fbe4de46
"LKY80"
2015-03-21 06:05:46 -07:00
The Android Automerger
1a10d739a7
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-03-21 06:05:08 -07:00
Brian Carlstrom
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
Brian Carlstrom
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
Mathieu Chartier
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
Brian Carlstrom
f7683b813a
Merge "Clearly explain that 32-bit x86 is not supported"
2015-03-20 21:52:38 +00:00
Mathieu Chartier
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
Paul Miller
5bd5869115
am 23588104
: am 971e5787
: Merge "Revert "Replace legacy Browser with BookmarkProvider""
...
* commit '23588104d5659ea797666c10a63a9b2c7ba8a09c':
Revert "Replace legacy Browser with BookmarkProvider"
2015-03-20 21:24:37 +00:00
Mathieu Chartier
55fbc49fe1
Merge "Change eng builds from interpret-only to verify-at-runtime"
2015-03-20 21:19:40 +00:00
Paul Miller
23588104d5
am 971e5787
: Merge "Revert "Replace legacy Browser with BookmarkProvider""
...
* commit '971e5787c0ebaa35f238bb99433cbfefd0bab50d':
Revert "Replace legacy Browser with BookmarkProvider"
2015-03-20 21:16:47 +00:00
Paul Miller
971e5787c0
Merge "Revert "Replace legacy Browser with BookmarkProvider""
2015-03-20 21:08:49 +00:00
Ying Wang
8200eff9a3
am 00391a43
: am 082184e7
: Merge "Bump generic_arm64 system partition size."
...
* commit '00391a43166a4271ad2471adffb75849be1984a8':
Bump generic_arm64 system partition size.
2015-03-20 20:41:09 +00:00
Ying Wang
00391a4316
am 082184e7
: Merge "Bump generic_arm64 system partition size."
...
* commit '082184e741232181f7b66d800142ef62dacbf765':
Bump generic_arm64 system partition size.
2015-03-20 20:34:40 +00:00
Ying Wang
082184e741
Merge "Bump generic_arm64 system partition size."
2015-03-20 20:29:52 +00:00
Ying Wang
6c194cb0c5
Bump generic_arm64 system partition size.
...
Change-Id: Ic53fdaa0143ee2c0cce5a2f750da4c52adc6fdb9
2015-03-20 13:29:10 -07:00
Brian Carlstrom
2cd8a74b2d
Clearly explain that 32-bit x86 is not supported
...
Change-Id: I7f352fae8fa3742c61dc74e20aacd32254451bce
2015-03-20 12:50:42 -07:00
Mathieu Chartier
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
Ying Wang
daeaa57a4e
am b9583756
: am 8e52e15d
: Merge "Bump generic_mips system partition size."
...
* commit 'b9583756eecda3dbad41b83fcba51ef7c07ac907':
Bump generic_mips system partition size.
2015-03-20 17:10:51 +00:00
Ying Wang
b9583756ee
am 8e52e15d
: Merge "Bump generic_mips system partition size."
...
* commit '8e52e15debb587e85915482ddb7464fb0429a6bb':
Bump generic_mips system partition size.
2015-03-20 17:05:06 +00:00
Paul Miller
54dfc3fc22
Revert "Replace legacy Browser with BookmarkProvider"
...
This reverts commit 6169022417
.
Change-Id: I0246ef7a89de08bc449509b39f8db8279ea0871e
BUG:19351071
2015-03-20 16:26:26 +00:00
Ying Wang
8e52e15deb
Merge "Bump generic_mips system partition size."
2015-03-20 16:20:00 +00:00
Ying Wang
779e9cc806
Bump generic_mips system partition size.
...
Change-Id: Ieb3becc3ddc1efa19c6e6d34b4a31c0440d3479d
2015-03-20 09:18:33 -07:00
Alexander Ivchenko
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
The Android Automerger
d578fc0b95
"LKY79"
2015-03-20 06:06:23 -07:00
The Android Automerger
055db7a11b
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-03-20 06:05:07 -07:00
Narayan Kamath
4de176b888
am 2002102e
: am ad22a8f2
: Merge "Remove VoiceDialer from PRODUCT_PACKAGE list."
...
* commit '2002102e36e96377849f708c4e1afe3c536763f8':
Remove VoiceDialer from PRODUCT_PACKAGE list.
2015-03-20 09:17:35 +00:00
Narayan Kamath
2002102e36
am ad22a8f2
: Merge "Remove VoiceDialer from PRODUCT_PACKAGE list."
...
* commit 'ad22a8f2a71209d0fec3c49bdd688678a3412540':
Remove VoiceDialer from PRODUCT_PACKAGE list.
2015-03-20 09:11:17 +00:00
Narayan Kamath
ad22a8f2a7
Merge "Remove VoiceDialer from PRODUCT_PACKAGE list."
2015-03-20 08:53:09 +00:00
Tao Bao
928b851ca1
am ae978751
: am 261e195d
: Merge "Make the generated OTAs repeatable"
...
* commit 'ae9787514d5709dff766f4791c00a4875eebbf50':
Make the generated OTAs repeatable
2015-03-20 03:27:55 +00:00
Dan Albert
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
Tao Bao
ae9787514d
am 261e195d
: Merge "Make the generated OTAs repeatable"
...
* commit '261e195dacde109d4b438d8af3e370c87b162a5d':
Make the generated OTAs repeatable
2015-03-20 03:18:43 +00:00
Dan Albert
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
Tao Bao
261e195dac
Merge "Make the generated OTAs repeatable"
2015-03-20 03:09:41 +00:00