Commit graph

22286 commits

Author SHA1 Message Date
Ying Wang
19a764a7fd Merge "Bump generic_arm64 system partition size." 2015-03-21 04:39:21 +00:00
Ying Wang
7a8c35dee9 Bump generic_arm64 system partition size.
Change-Id: Ic53fdaa0143ee2c0cce5a2f750da4c52adc6fdb9
2015-03-20 21:38:38 -07:00
Ying Wang
0754f2f1ad am daeaa57a: am b9583756: am 8e52e15d: Merge "Bump generic_mips system partition size."
* commit 'daeaa57a4e72d50f0c3b64d8bf0ea706925fc329':
  Bump generic_mips system partition size.
2015-03-20 17:17:06 +00: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
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
e18445ead8 am 4de176b8: am 2002102e: am ad22a8f2: Merge "Remove VoiceDialer from PRODUCT_PACKAGE list."
* commit '4de176b888f7dda32e1a3d01fb9add7a1774f080':
  Remove VoiceDialer from PRODUCT_PACKAGE list.
2015-03-20 09:23:50 +00: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
b71d609061 am 928b851c: am ae978751: am 261e195d: Merge "Make the generated OTAs repeatable"
* commit '928b851ca178733ba61eef72a1b7e004f9a111e7':
  Make the generated OTAs repeatable
2015-03-20 03:33:21 +00:00
Dan Albert
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
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
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
Chih-Hung Hsieh
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
Tao Bao
04ecdda5d0 am 48fe5b7c: am fc267120: am b7e5ab6f: Merge "Allow system images larger than 2GiB."
* commit '48fe5b7cadca3c945e81182411e9537cb11d81d3':
  Allow system images larger than 2GiB.
2015-03-19 21:30:20 +00:00
Tao Bao
48fe5b7cad am fc267120: am b7e5ab6f: Merge "Allow system images larger than 2GiB."
* commit 'fc2671201caeac485440c2aa146f35a99002bca2':
  Allow system images larger than 2GiB.
2015-03-19 21:24:59 +00:00
Tao Bao
fc2671201c am b7e5ab6f: Merge "Allow system images larger than 2GiB."
* commit 'b7e5ab6fbd4e573515c30772ac813a5fc4bce680':
  Allow system images larger than 2GiB.
2015-03-19 21:17:32 +00: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
8b01ac4a59 am a6726d1f: am e601f1ec: am d121f184: Merge "Replace legacy Browser with BookmarkProvider"
* commit 'a6726d1f3001b84c51da523d09f079274e39902e':
  Replace legacy Browser with BookmarkProvider
2015-03-19 20:42:54 +00:00
Paul Miller
a6726d1f30 am e601f1ec: am d121f184: Merge "Replace legacy Browser with BookmarkProvider"
* commit 'e601f1ecfd9ba938053b6763124ea1359efeddbe':
  Replace legacy Browser with BookmarkProvider
2015-03-19 20:35:10 +00:00
Paul Miller
e601f1ecfd am d121f184: Merge "Replace legacy Browser with BookmarkProvider"
* commit 'd121f18450520c4869a807533b4abf1adb1e846c':
  Replace legacy Browser with BookmarkProvider
2015-03-19 20:28:29 +00: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
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
Mathieu Chartier
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
Mathieu Chartier
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
Mathieu Chartier
9682e56a79 Merge "Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"" 2015-03-19 16:44:56 +00:00
Justin Morey
e596433b90 am abd5bbc4: am 292427b6: am 030b5493: resolved conflicts for merge of 68000907 to lmp-mr1-dev
* commit 'abd5bbc4febe61f53641ac7c43160e161e12c1dc':
  Bump generic_x86_64 system partition size - DO NOT MERGE
2015-03-19 03:07:24 +00:00
Justin Morey
abd5bbc4fe 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
2015-03-19 03:00:29 +00:00
Justin Morey
292427b69f am 030b5493: resolved conflicts for merge of 68000907 to lmp-mr1-dev
* commit '030b5493147d47a726e9f3e0e474772b29ad3111':
  Bump generic_x86_64 system partition size - DO NOT MERGE
2015-03-19 02:47:00 +00:00
Justin Morey
030b549314 resolved conflicts for merge of 68000907 to lmp-mr1-dev
Change-Id: I9f1a80746a5d945c704cd126efebca0941e27e47
2015-03-18 21:29:09 -05: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
Tao Bao
2c92413e72 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: Iaf834a2d99dfea0bb423a4a2aa09e8906424482d
(cherry picked from commit daebaa6ed3)
2015-03-18 16:13:10 -07:00
Justin Morey
68000907e3 am 02060b7b: Bump generic_x86_64 system partition size - DO NOT MERGE
* commit '02060b7bddbb8728fa5a4ba5e0905e5a173bc682':
  Bump generic_x86_64 system partition size - DO NOT MERGE
2015-03-18 23:00:33 +00: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
Justin Morey
02060b7bdd Bump generic_x86_64 system partition size - DO NOT MERGE
This makes it big enough to hold Orla, unbreaking the build

Change-Id: I5a131dfbaaa3aa2bb1bc24e4f859cc3507b671b0
2015-03-18 21:04:14 +00:00
Yohann Roussel
12f28287dc Merge "Use java -jar ... instead of java -cp ..." 2015-03-17 17:34:27 +00:00
Yohann Roussel
76a5e0bd1a Use java -jar ... instead of java -cp ...
When running Jack or Jill.

Change-Id: I2127f183f8f033a9d35a7e8247a9432252a58bc8
2015-03-17 17:03:22 +01:00
Mathieu Chartier
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
Christopher Ferris
d268c14454 am e0881796: am 8081a8b5: am 13169ccb: Merge "Revert "Switch x86 and x86_64 build to use GCC 4.9""
* commit 'e088179677b50cac9ef7c1ab83e89ed338a9b7ed':
  Revert "Switch x86 and x86_64 build to use GCC 4.9"
2015-03-17 14:47:30 +00:00
Elliott Hughes
e0203b17fa am bf8164f9: am 47584657: am 0f98a378: Merge "Remove netcfg from the list of base modules."
* commit 'bf8164f938f0af98b76e481de6c415fa496cfe21':
  Remove netcfg from the list of base modules.
2015-03-17 14:47:28 +00:00