Commit Graph

21341 Commits

Author SHA1 Message Date
Dan Albert 5d60719e42 Merge "Run ZipFile.testzip() during zipfile tests." 2015-03-24 00:07:02 +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 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
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
Brian Carlstrom f7683b813a Merge "Clearly explain that 32-bit x86 is not supported" 2015-03-20 21:52:38 +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 971e5787c0 Merge "Revert "Replace legacy Browser with BookmarkProvider"" 2015-03-20 21:08:49 +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
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
Narayan Kamath ad22a8f2a7 Merge "Remove VoiceDialer from PRODUCT_PACKAGE list." 2015-03-20 08:53:09 +00:00
Tao Bao 261e195dac Merge "Make the generated OTAs repeatable" 2015-03-20 03:09:41 +00:00
Dan Albert 59112a2da3 Merge "Static binaries with libc++ need libs c, m and dl." 2015-03-20 03:04:20 +00:00
Tao Bao b8c8717191 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
2015-03-19 19:42:12 -07:00
Tao Bao b7e5ab6fbd Merge "Allow system images larger than 2GiB." 2015-03-19 21:10:55 +00:00
Dan Albert 8e0178d41b 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 cd082d4bfe)

Change-Id: I7b5cc310e0a9ba894533b53cb998afd5ce96d8c6
2015-03-19 13:59:01 -07:00
Paul Miller d121f18450 Merge "Replace legacy Browser with BookmarkProvider" 2015-03-19 20:23:22 +00:00
Dan Albert 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
Narayan Kamath fadee109d6 Remove VoiceDialer from PRODUCT_PACKAGE list.
Change-Id: Ibc86ddee90a9ff83c3cdcbf086a6a1e466ba5088
2015-03-19 18:10:15 +00:00
Mathieu Chartier 9682e56a79 Merge "Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"" 2015-03-19 16:44:56 +00:00
Mathieu Chartier 8b11285dd9 Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
Bug: 19735273

This reverts commit 3abfcfc17b.

Change-Id: Iac930925ab6d5cd5947fa4077c8d93e2984927d5
2015-03-18 19:06:28 -07:00
Paul Miller 6169022417 Replace legacy Browser with BookmarkProvider
BookmarkProvider is Browser's old provider code, refactored into its
own app.

BUG:19351071
Change-Id: I0a5e1f2fc54749e2d3e3442636a26b2459b600c6
2015-03-18 15:44:21 -07:00
Mathieu Chartier 8ca542f439 Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit" 2015-03-17 02:04:42 +00:00
Christopher Ferris 13169ccba2 Merge "Revert "Switch x86 and x86_64 build to use GCC 4.9"" 2015-03-17 01:31:16 +00:00
Christopher Ferris f123057f5e Revert "Switch x86 and x86_64 build to use GCC 4.9"
This reverts commit 533c7aa6a2.

Change-Id: I5203db8454d9af8fb438af6308106945e5dc0dbf
2015-03-17 01:29:51 +00:00
Elliott Hughes 0f98a3781c Merge "Remove netcfg from the list of base modules." 2015-03-17 00:58:29 +00:00
Andrew Hsieh bf0b6df4c1 Merge "Switch x86 and x86_64 build to use GCC 4.9" 2015-03-16 23:50:19 +00:00
Mathieu Chartier 3abfcfc17b Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
Bug: 19735273
Change-Id: Ia0d748b511230f5e0c7d0763de3abeab9d6e0ca7
2015-03-16 16:29:30 -07:00
Elliott Hughes f3124b3523 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
2015-03-16 13:52:30 -07:00
Ying Wang d73696c1fe Merge "Load cts/build/config.mk after build/core/config.mk" 2015-03-16 18:57:37 +00:00
Ying Wang 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
Andrew Hsieh 533c7aa6a2 Switch x86 and x86_64 build to use GCC 4.9
Change-Id: I41a7650d0e56c820a59c261d16afd6f0b9ec38c2
2015-03-16 13:17:59 +08:00
Tao Bao 18b27966a6 Merge "Restrict the verification in block-based incremental OTAs" 2015-03-14 05:01:34 +00:00
Tao Bao dd2a5892e5 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 daebaa6ed3)
2015-03-13 17:57:15 -07:00
Dan Albert 3ad14218cc Merge "Strip prebuilt shared library by default." 2015-03-13 23:18:47 +00:00
Dan Albert 8de543fdec Merge "Switch NDK libraries to 4.9 for x86_64 and mips64" 2015-03-13 23:18:25 +00:00
Dan Albert 9db3e6c61f Merge "Support "LOCAL_FDO_SUPPORT := always"." 2015-03-13 23:17:52 +00:00
Dan Albert c70805eef5 Merge "Set up environmental variable PATH before calling releasetools scripts." 2015-03-13 23:17:26 +00:00
Dan Albert fcd0d98b6c Merge "include oem.prop files in otatools_package" 2015-03-13 23:17:02 +00:00
Dan Albert 137b049aef Merge "DO NOT MERGE: Bundle libc++.so into otatools-package." 2015-03-13 20:44:09 +00:00
Dan Albert 4cdf135743 Merge "add otatools-package target" 2015-03-13 20:32:59 +00:00
Dan Albert cb9ace32d4 Merge "Do not use block_verify on target-files where feature is missing." 2015-03-13 20:31:41 +00:00