OSDN Git Service
Ying Wang [Tue, 31 Mar 2015 00:13:39 +0000 (00:13 +0000)]
am
d64b853a: Merge "Bump generic_mips64 system partition size."
* commit '
d64b853a6d45d11e1f892ad02c0a653e1b5b8663':
Bump generic_mips64 system partition size.
Ying Wang [Tue, 31 Mar 2015 00:09:06 +0000 (00:09 +0000)]
Merge "Bump generic_mips64 system partition size."
Duane Sand [Tue, 31 Mar 2015 00:02:00 +0000 (17:02 -0700)]
Bump generic_mips64 system partition size.
Fix broken mips64 build via 20% increase.
Change-Id: Ie30418c6fc7cf8810139abe53537ef8259a49a2f
Dan Albert [Sat, 28 Mar 2015 02:20:24 +0000 (02:20 +0000)]
am
f1a8c8c5: Merge "Fix up a few callers of GetTypeAndDevice."
* commit '
f1a8c8c5de090221615bf1934e82e1fa9afc54b0':
Fix up a few callers of GetTypeAndDevice.
Dan Albert [Sat, 28 Mar 2015 02:15:43 +0000 (02:15 +0000)]
Merge "Fix up a few callers of GetTypeAndDevice."
Dan Albert [Sat, 28 Mar 2015 02:11:53 +0000 (19:11 -0700)]
Fix up a few callers of GetTypeAndDevice.
Change-Id: I8f2d8d28b60715f917e9aceb8f851ad652034aa7
Chih-hung Hsieh [Fri, 27 Mar 2015 23:17:43 +0000 (23:17 +0000)]
am
d63c78e0: Merge "Allow -mcpu=cortex-a15 for clang"
* commit '
d63c78e058da1418db133f62df4ace6f8109965b':
Allow -mcpu=cortex-a15 for clang
Chih-hung Hsieh [Fri, 27 Mar 2015 22:33:04 +0000 (22:33 +0000)]
Merge "Allow -mcpu=cortex-a15 for clang"
Dan Albert [Fri, 27 Mar 2015 18:47:32 +0000 (18:47 +0000)]
am
99e22a57: Merge "Make releasetools pylint clean."
* commit '
99e22a57d0b186cb853d757a058318a8be78918b':
Make releasetools pylint clean.
Ying Wang [Fri, 27 Mar 2015 18:47:31 +0000 (18:47 +0000)]
am
8ffec13d: Merge "Add back Java resources to apk without Java code."
* commit '
8ffec13d9b3ea46a5aea1837c1184e67a908f1ef':
Add back Java resources to apk without Java code.
Dan Albert [Fri, 27 Mar 2015 18:40:02 +0000 (18:40 +0000)]
Merge "Make releasetools pylint clean."
Ying Wang [Fri, 27 Mar 2015 18:32:00 +0000 (18:32 +0000)]
Merge "Add back Java resources to apk without Java code."
Ying Wang [Fri, 27 Mar 2015 18:07:17 +0000 (11:07 -0700)]
Add back Java resources to apk without Java code.
With commit
33360dd56925276e4526f5f52c26423e2bb1a670 we moved Java
resource packaging forward to creation of the jar file. But the Java
resource packaging will be skipped if a module has no Java code at all.
(The build system does support building an apk without Java code.)
In this change we add back the Java resources directly to the built apk
when the apk has no Java code.
(cherry-picked from commit
8b27d1879c5692ebe6c5ac85383981fd96dfe2e1)
Bug:
19947218
Change-Id: I0e1a65a9cbe656974f8ef3923b2f15e9efa5feb9
Ying Wang [Fri, 27 Mar 2015 16:52:49 +0000 (16:52 +0000)]
am
1b23b33d: Merge "MKBOOTIMG override were missing in two places"
* commit '
1b23b33d92f32626584153739308e9147d1541bd':
MKBOOTIMG override were missing in two places
Ying Wang [Fri, 27 Mar 2015 16:47:15 +0000 (16:47 +0000)]
Merge "MKBOOTIMG override were missing in two places"
Ying Wang [Thu, 26 Mar 2015 23:30:42 +0000 (23:30 +0000)]
am
d5415dc7: Merge "Fix: exit code is 0 even when check-boot-jars.py fails"
* commit '
d5415dc778abffdf7a9abba52b093da7a20496be':
Fix: exit code is 0 even when check-boot-jars.py fails
Ying Wang [Thu, 26 Mar 2015 23:25:30 +0000 (23:25 +0000)]
Merge "Fix: exit code is 0 even when check-boot-jars.py fails"
Ying Wang [Thu, 26 Mar 2015 17:50:10 +0000 (17:50 +0000)]
am
6ff1b035: Merge "Support to build image of root file system with /system and ramdisk combined."
* commit '
6ff1b0357289c1ef1a7aa9294aae748dacb69866':
Support to build image of root file system with /system and ramdisk combined.
Ying Wang [Thu, 26 Mar 2015 17:36:07 +0000 (17:36 +0000)]
Merge "Support to build image of root file system with /system and ramdisk combined."
Ying Wang [Wed, 25 Mar 2015 02:07:40 +0000 (19:07 -0700)]
Support to build image of root file system with /system and ramdisk combined.
Added support to build system.img that combines contents of /system and
the ramdisk, and can be mounted at the root of the file system.
To enable this feature, define BoardConfig.mk variable:
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
Ideally we would just change TARGET_OUT (the path of the staging system
directory) to under TARGET_ROOT_OUT. But at this point many places in
the build system assume TARGET_OUT is independent of TARGET_ROOT_OUT and
we can't make it easily configurable.
Instead this implementation takes the least intrusive approach:
We don't change TARGET_OUT or TARGET_ROOT_OUT. We just assemble a
temporary staging directory that contains contents of both TARGET_OUT
and TARGET_ROOT_OUT, in build_image.BuildImage() of
tools/releasetools/build_image.py.
When build_image.py is directly called from the makefile, we pass in the
parameters from the global dictionary; when build_image.BuildImage() is
called from add_img_to_target_files.py, we need to override values to
point to files extracted from the target_files zip file.
We need to combine the fs_config files of both /system and ramdisk,
when fs_config is enabled.
Also this change refactored build_image.BuildImage() by moving the extra
parameters to the image property dictionary.
(cherry-picked from commit
0eabd4f2c5fe704d3c3212b45b80775a35b55b1b)
Bug:
19868522
Change-Id: Iafc467a0e3427b0d6ad3b575abcc98ddcc9ea0f1
Richard Uhler [Thu, 26 Mar 2015 15:04:43 +0000 (15:04 +0000)]
am
e7173cee: Merge "Store odex files in oat/<isa>/ directory."
* commit '
e7173cee108fe82b0469c456f69fe5a4160d5192':
Store odex files in oat/<isa>/ directory.
Richard Uhler [Thu, 26 Mar 2015 14:57:33 +0000 (14:57 +0000)]
Merge "Store odex files in oat/<isa>/ directory."
Jiyong Park [Thu, 26 Mar 2015 04:06:40 +0000 (13:06 +0900)]
Fix: exit code is 0 even when check-boot-jars.py fails
Fix the bug that build is still success when boot jars contain
non-whitelisted classes. Now, check-boot-jars.py correctly
finishes with exit code 1 when non-whitelisted classes are found.
Change-Id: Id5c80ef9fdb70213d878d569f6033be2c9eb90d3
Christopher Ferris [Wed, 25 Mar 2015 18:50:10 +0000 (18:50 +0000)]
am
a45223b6: Merge "Revert "Switch x86 and x86_64 to 4.9. Attempt #2.""
* commit '
a45223b63566d8496250ae797778a4d16ee81419':
Revert "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.
Christopher Ferris [Wed, 25 Mar 2015 18:28:53 +0000 (18:28 +0000)]
Merge "Revert "Switch x86 and x86_64 to 4.9. Attempt #2.""
Christopher Ferris [Wed, 25 Mar 2015 18:27:21 +0000 (18:27 +0000)]
Revert "Switch x86 and x86_64 to 4.9. Attempt #2."
This reverts commit
6fb735b07132b613de1b5b64c5c31a36c4b9ac2d.
Change-Id: I64b868cdfb3571de5e8b01e4257b5dfa9ee44d0d
Ying Wang [Wed, 25 Mar 2015 18:11:54 +0000 (18:11 +0000)]
Merge "Switch x86 and x86_64 to 4.9. Attempt #2."
Bernhard Rosenkränzer [Wed, 25 Mar 2015 15:59:46 +0000 (16:59 +0100)]
Allow -mcpu=cortex-a15 for clang
Clang 3.6 (including the snapshot present in AOSP) added support for
-mcpu=cortex-a15 -- there's no need to fall back to generic armv7-a
anymore.
Change-Id: I8a582261ac35e32f8f1def1d244cf83f2096520d
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Per Astrand [Wed, 25 Mar 2015 13:06:30 +0000 (14:06 +0100)]
MKBOOTIMG override were missing in two places
The change follows the patten found in "Package OTA" and other places
to allow for overriding the mkbootimg command.
Now pass MKBOOTIMG variable to get make_recovery_patch and add_image_to_target
to use the tool set in BOARD_CUSTOM_MKBOOTIMG for boot/recovery image
generation.
Change-Id: I78533c25e87c2750eb24ac1bf39e4b7ca321a441
Dan Albert [Tue, 24 Mar 2015 02:13:21 +0000 (19:13 -0700)]
Make releasetools pylint clean.
This caught a few bugs/syntax errors (a few character classes were not
escaped properly in regex patterns, some indentation was illegal,
etc).
Change-Id: I50637607524e68c4fb9cad7167f58a46b8d26b2c
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: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 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>
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: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
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
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: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: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: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: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: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: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: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""
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
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
Richard Uhler [Mon, 16 Mar 2015 21:38:17 +0000 (14:38 -0700)]
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
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 [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: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: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)
Dan Albert [Fri, 13 Mar 2015 23:21:25 +0000 (23:21 +0000)]
am
3ad14218: Merge "Strip prebuilt shared library by default."
* commit '
3ad14218ccca2c729dfd90a24050e40fc52a56bf':
Strip prebuilt shared library by default.
Dan Albert [Fri, 13 Mar 2015 23:21:24 +0000 (23:21 +0000)]
am
8de543fd: Merge "Switch NDK libraries to 4.9 for x86_64 and mips64"
* commit '
8de543fdec61cae9eef8e3b3f7a0e5cc4cd0aa70':
Switch NDK libraries to 4.9 for x86_64 and mips64
Dan Albert [Fri, 13 Mar 2015 23:21:23 +0000 (23:21 +0000)]
am
9db3e6c6: Merge "Support "LOCAL_FDO_SUPPORT := always"."
* commit '
9db3e6c61fe10073a2ed829f1036bc6281767202':
Support "LOCAL_FDO_SUPPORT := always".
Dan Albert [Fri, 13 Mar 2015 23:21:21 +0000 (23:21 +0000)]
am
c70805ee: Merge "Set up environmental variable PATH before calling releasetools scripts."
* commit '
c70805eef5be3e10003518d24adb083dcd1efbc2':
Set up environmental variable PATH before calling releasetools scripts.