StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,927 Commits 1 Branch 0 Tags
df7afb47d8d69f53316218dd4b0510aa8201ce7c
Commit Graph

21927 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
The Android Automerger
539a396b36 "LKY78" 2015-03-19 06:06:46 -07:00
The Android Automerger
b2e4aa67a2 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-19 06:05:10 -07: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
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
Richard Uhler
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
The Android Automerger
4568ab2e05 "LKY77" 2015-03-18 06:06:27 -07:00
The Android Automerger
2dca75ddb3 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-18 06:05:20 -07:00
Mathieu Chartier
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
Christopher Ferris
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
Elliott Hughes
bf8164f938 am 47584657: am 0f98a378: Merge "Remove netcfg from the list of base modules." 
* commit '475846579e99aaeeddaaaf23c67435b6daca13e2':
  Remove netcfg from the list of base modules.
 2015-03-17 14:41:12 +00:00
Mathieu Chartier
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
Christopher Ferris
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
Elliott Hughes
475846579e am 0f98a378: Merge "Remove netcfg from the list of base modules." 
* commit '0f98a3781c4fab57bdd696cca3edd6614d65abe6':
  Remove netcfg from the list of base modules.
 2015-03-17 14:32:48 +00:00
The Android Automerger
dbf0141086 "LKY76" 2015-03-17 06:06:41 -07:00
The Android Automerger
8bc6dbdd84 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-17 06:05:08 -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
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
Andrew Hsieh
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