OSDN Git Service
Ying Wang [Fri, 27 Mar 2015 01:09:13 +0000 (01:09 +0000)]
am
1c10f075: am
abba8a91: am
fcf0b138: am
ad54a4da: Add selinux and verity support to custom image generation.
* commit '
1c10f0757294d5d46c2e4d8b17da230715897ba6':
The Android Automerger [Fri, 27 Mar 2015 01:09:12 +0000 (01:09 +0000)]
Ying Wang [Fri, 27 Mar 2015 00:52:58 +0000 (00:52 +0000)]
am
abba8a91: am
fcf0b138: am
ad54a4da: Add selinux and verity support to custom image generation.
* commit '
abba8a9117682f064dcc5c9ffb71fe38352a7918':
The Android Automerger [Fri, 27 Mar 2015 00:52:57 +0000 (00:52 +0000)]
Ying Wang [Fri, 27 Mar 2015 00:43:40 +0000 (00:43 +0000)]
am
fcf0b138: am
ad54a4da: Add selinux and verity support to custom image generation.
* commit '
fcf0b1383999ce1da2ee9117884e31ca6620253b':
Ying Wang [Fri, 27 Mar 2015 00:33:25 +0000 (00:33 +0000)]
am
ad54a4da: Add selinux and verity support to custom image generation.
* commit '
ad54a4dab520d84f76c9ad6a83be92b5563de24e':
Add selinux and verity support to custom image generation.
Ying Wang [Thu, 26 Mar 2015 23:51:07 +0000 (23:51 +0000)]
am
e6b9f286: am
bc9ade72: am
d5415dc7: Merge "Fix: exit code is 0 even when check-boot-jars.py fails"
* commit '
e6b9f2869110a35316022c639bf3d932034783d3':
Fix: exit code is 0 even when check-boot-jars.py fails
Ying Wang [Thu, 26 Mar 2015 23:37:47 +0000 (23:37 +0000)]
am
bc9ade72: am
d5415dc7: Merge "Fix: exit code is 0 even when check-boot-jars.py fails"
* commit '
bc9ade722f2fe2d4dcc71931cdfd62661d822027':
Fix: exit code is 0 even when check-boot-jars.py fails
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"
Baligh Uddin [Thu, 26 Mar 2015 23:03:13 +0000 (23:03 +0000)]
Merge "Add bootsigner path as an option"
The Android Automerger [Thu, 26 Mar 2015 21:24:19 +0000 (21:24 +0000)]
am
b595d5a3: am
a2ef9dd1: am
1a10d739: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
* commit '
b595d5a330dc349888e8fe155f4171bcd8a2845f': (40 commits)
"LKY79"
"LKY78"
"LKY77"
"LKY76"
"LKY75"
"LKY73"
"LKY72"
"LKY71"
"LKY70"
"LKY69"
"LKY68"
"LKY66"
"LKY65"
"LKY64"
"LKY63"
"LKY62"
LKY61B
"LKY61"
"LKY59"
"LKY58"
...
The Android Automerger [Thu, 26 Mar 2015 21:09:39 +0000 (21:09 +0000)]
am
a2ef9dd1: am
1a10d739: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
* commit '
a2ef9dd1f90b8d090ec30a0e1af8322e1438ba10': (40 commits)
"LKY79"
"LKY78"
"LKY77"
"LKY76"
"LKY75"
"LKY73"
"LKY72"
"LKY71"
"LKY70"
"LKY69"
"LKY68"
"LKY66"
"LKY65"
"LKY64"
"LKY63"
"LKY62"
LKY61B
"LKY61"
"LKY59"
"LKY58"
...
The Android Automerger [Thu, 26 Mar 2015 21:00:05 +0000 (21:00 +0000)]
The Android Automerger [Thu, 26 Mar 2015 21:00:01 +0000 (21:00 +0000)]
am
1a10d739: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
* commit '
1a10d739a79721ec8154a28884746ce472104777': (40 commits)
"LKY79"
"LKY78"
"LKY77"
"LKY76"
"LKY75"
"LKY73"
"LKY72"
"LKY71"
"LKY70"
"LKY69"
"LKY68"
"LKY66"
"LKY65"
"LKY64"
"LKY63"
"LKY62"
LKY61B
"LKY61"
"LKY59"
"LKY58"
...
David Riley [Thu, 26 Mar 2015 20:22:21 +0000 (20:22 +0000)]
Merge "Add support to sign boot images with vboot."
Ying Wang [Thu, 26 Mar 2015 18:19:20 +0000 (18:19 +0000)]
am
52ea2066: am
abc748c1: am
6ff1b035: Merge "Support to build image of root file system with /system and ramdisk combined."
* commit '
52ea2066a1c3aedf44e3f64bfe1e4db80707e98f':
Support to build image of root file system with /system and ramdisk combined.
Richard Uhler [Thu, 26 Mar 2015 18:19:19 +0000 (18:19 +0000)]
am
c801deac: am
74b11051: am
e7173cee: Merge "Store odex files in oat/<isa>/ directory."
* commit '
c801deac20c6944095e2316bb4b97b3dc3e11446':
Store odex files in oat/<isa>/ directory.
Ying Wang [Thu, 26 Mar 2015 17:57:22 +0000 (17:57 +0000)]
am
abc748c1: am
6ff1b035: Merge "Support to build image of root file system with /system and ramdisk combined."
* commit '
abc748c11cbba71a99f306d318c74b5336b28730':
Support to build image of root file system with /system and ramdisk combined.
David Riley [Tue, 3 Mar 2015 16:54:11 +0000 (08:54 -0800)]
Add support to sign boot images with vboot.
Change-Id: I924468fe06f7d38d4fc49c2ae9dfee734fd58867
Signed-off-by: David Riley <davidriley@google.com>
(cherry picked from commit
14fb7236c1942a9f5050b3e608a0f5f4cd1cae1d)
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.
bohu [Thu, 26 Mar 2015 17:39:53 +0000 (17:39 +0000)]
Merge "Add fingerprint HAL to emulator system images"
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
Ying Wang [Thu, 26 Mar 2015 17:33:59 +0000 (17:33 +0000)]
Merge "Support to build image of root file system with /system and ramdisk combined."
bohu [Thu, 26 Mar 2015 17:14:38 +0000 (10:14 -0700)]
Add fingerprint HAL to emulator system images
This will build fingerprint.goldfish.so and fingerprint.ranchu.so
HALs for emulator system images and put them into the hw/
directory.
Change-Id: I6959d4b8e99ea0476c324c01ff05e44716ad8fa1
Richard Uhler [Thu, 26 Mar 2015 15:11:26 +0000 (15:11 +0000)]
am
74b11051: am
e7173cee: Merge "Store odex files in oat/<isa>/ directory."
* commit '
74b1105102ea00a30c516a06f8c5036d6ce44522':
Store odex files in oat/<isa>/ directory.
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 21:08:26 +0000 (21:08 +0000)]
am
9226f8fc: am
07aa4c1f: am
a45223b6: Merge "Revert "Switch x86 and x86_64 to 4.9. Attempt #2.""
* commit '
9226f8fc3be69d6c3ba9ea583aa36845e91eb7e4':
Revert "Switch x86 and x86_64 to 4.9. Attempt #2."
Ying Wang [Wed, 25 Mar 2015 21:08:24 +0000 (21:08 +0000)]
am
335b1918: am
5a8f7067: am
e9b15e2c: Merge "Switch x86 and x86_64 to 4.9. Attempt #2."
* commit '
335b19180077bd56ae5db605a92f0034c25f679e':
Switch x86 and x86_64 to 4.9. Attempt #2.
Christopher Ferris [Wed, 25 Mar 2015 18:58:54 +0000 (18:58 +0000)]
am
07aa4c1f: am
a45223b6: Merge "Revert "Switch x86 and x86_64 to 4.9. Attempt #2.""
* commit '
07aa4c1feea3e16a99f082b71a631b20ddb8dddf':
Revert "Switch x86 and x86_64 to 4.9. Attempt #2."
Ying Wang [Wed, 25 Mar 2015 18:58:52 +0000 (18:58 +0000)]
am
5a8f7067: am
e9b15e2c: Merge "Switch x86 and x86_64 to 4.9. Attempt #2."
* commit '
5a8f70678b17e8628abcac8fc7c3b31ebd4dffc3':
Switch x86 and x86_64 to 4.9. Attempt #2.
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."
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.
Bug:
19868522
Change-Id: Iafc467a0e3427b0d6ad3b575abcc98ddcc9ea0f1
Dan Albert [Tue, 24 Mar 2015 03:25:31 +0000 (03:25 +0000)]
am
220a0332: am
c47f47b7: am
5d60719e: Merge "Run ZipFile.testzip() during zipfile tests."
* commit '
220a0332d318d0dcf7d3611c78084e066ada8e54':
Run ZipFile.testzip() during zipfile tests.
Tao Bao [Tue, 24 Mar 2015 03:25:24 +0000 (03:25 +0000)]
am
3e88a16b: am
2d139fcf: am
0488079d: Merge "Fix the computation of basefilename"
* commit '
3e88a16b0e5eb0896d52b5c4e3488527d9a95f26':
Fix the computation of basefilename
Greg Hackmann [Tue, 24 Mar 2015 02:59:31 +0000 (02:59 +0000)]
am
3b88235d: am
9f201b18: am
088521ef: Merge "Allow system images larger than 2GiB, pt. 2"
* commit '
3b88235d04156d8a0346d74b5d3a9575c3b02121':
Allow system images larger than 2GiB, pt. 2
Ying Wang [Tue, 24 Mar 2015 02:57:28 +0000 (02:57 +0000)]
am
c85af624: am
743b9f49: am
ad54a4da: Add selinux and verity support to custom image generation.
* commit '
c85af62429e4207e4a8e15a6ce401001364fb281':
Add selinux and verity support to custom image generation.
Tao Bao [Tue, 24 Mar 2015 01:30:59 +0000 (01:30 +0000)]
am
45aece22: am
62eed4d8: am
b5901670: Merge "Fix the syntax error in the edify script generator"
* commit '
45aece22330ec2621f2a72ef16675cfe128ae56b':
Fix the syntax error in the edify script generator
Dan Albert [Tue, 24 Mar 2015 00:18:47 +0000 (00:18 +0000)]
am
c47f47b7: am
5d60719e: Merge "Run ZipFile.testzip() during zipfile tests."
* commit '
c47f47b74f6ed6daa83e3f4357cf315a4b617f6e':
Run ZipFile.testzip() during zipfile tests.
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:58:49 +0000 (23:58 +0000)]
am
2d139fcf: am
0488079d: Merge "Fix the computation of basefilename"
* commit '
2d139fcf2916ad6d0008cf32a2fc1c2899eda3ff':
Fix the computation of basefilename
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
Brian Carlstrom [Mon, 23 Mar 2015 22:55:30 +0000 (22:55 +0000)]
am
3ba88e7d: am
b7fe2e62: am
f7683b81: Merge "Clearly explain that 32-bit x86 is not supported"
* commit '
3ba88e7d2dbc7f4d52202d58614cdcd566539455':
Clearly explain that 32-bit x86 is not supported
Mathieu Chartier [Mon, 23 Mar 2015 22:55:28 +0000 (22:55 +0000)]
am
783a632f: am
7f914204: am
55fbc49f: Merge "Change eng builds from interpret-only to verify-at-runtime"
* commit '
783a632f45fdddaa2073445728db61d2041a3435':
Change eng builds from interpret-only to verify-at-runtime
Paul Miller [Mon, 23 Mar 2015 22:55:27 +0000 (22:55 +0000)]
am
5bd58691: am
23588104: am
971e5787: Merge "Revert "Replace legacy Browser with BookmarkProvider""
* commit '
5bd5869115fa80cc4a94752e160d3df001d6d3d6':
Revert "Replace legacy Browser with BookmarkProvider"
Ying Wang [Mon, 23 Mar 2015 22:55:26 +0000 (22:55 +0000)]
am
8200eff9: am
00391a43: am
082184e7: Merge "Bump generic_arm64 system partition size."
* commit '
8200eff9a3cf6f0ddaf80897f7a38297bd7ed009':
Bump generic_arm64 system partition size.
Greg Hackmann [Mon, 23 Mar 2015 22:03:08 +0000 (22:03 +0000)]
am
9f201b18: am
088521ef: Merge "Allow system images larger than 2GiB, pt. 2"
* commit '
9f201b18be8a4cecd27d7b5635c0892fbb00c591':
Allow system images larger than 2GiB, pt. 2
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>
Ying Wang [Mon, 23 Mar 2015 18:02:30 +0000 (18:02 +0000)]
am
743b9f49: am
ad54a4da: Add selinux and verity support to custom image generation.
* commit '
743b9f498b68af1c70eec8e7ca7055a9c23ce6f5':
Add selinux and verity support to custom image generation.
Ying Wang [Mon, 23 Mar 2015 17:55:09 +0000 (17:55 +0000)]
am
ad54a4da: Add selinux and verity support to custom image generation.
* commit '
ad54a4dab520d84f76c9ad6a83be92b5563de24e':
Add selinux and verity support to custom image generation.
Ying Wang [Sat, 21 Mar 2015 00:43:02 +0000 (17:43 -0700)]
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
7d51a4029590b58e22071eed919d59a0ff205bef)
Ying Wang [Sat, 21 Mar 2015 00:43:02 +0000 (17:43 -0700)]
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
Yohann Roussel [Mon, 23 Mar 2015 14:18:26 +0000 (14:18 +0000)]
Merge "Turn off Jack warnings by default"
Tao Bao [Mon, 23 Mar 2015 03:43:30 +0000 (03:43 +0000)]
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
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
The Android Automerger [Sat, 21 Mar 2015 13:05:46 +0000 (06:05 -0700)]
"LKY80"
The Android Automerger [Sat, 21 Mar 2015 13:05:08 +0000 (06:05 -0700)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
Ying Wang [Sat, 21 Mar 2015 04:39:20 +0000 (04:39 +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 22:09:36 +0000 (22:09 +0000)]
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
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
Mathieu Chartier [Fri, 20 Mar 2015 21:58:48 +0000 (21:58 +0000)]
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
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
Paul Miller [Fri, 20 Mar 2015 21:24:37 +0000 (21:24 +0000)]
am
23588104: am
971e5787: Merge "Revert "Replace legacy Browser with BookmarkProvider""
* commit '
23588104d5659ea797666c10a63a9b2c7ba8a09c':
Revert "Replace legacy Browser with BookmarkProvider"
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:41:09 +0000 (20:41 +0000)]
am
00391a43: am
082184e7: Merge "Bump generic_arm64 system partition size."
* commit '
00391a43166a4271ad2471adffb75849be1984a8':
Bump generic_arm64 system partition size.
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:17:06 +0000 (17:17 +0000)]
am
daeaa57a: am
b9583756: am
8e52e15d: Merge "Bump generic_mips system partition size."
* commit '
daeaa57a4e72d50f0c3b64d8bf0ea706925fc329':
Bump generic_mips system partition size.
Ying Wang [Fri, 20 Mar 2015 17:10:51 +0000 (17:10 +0000)]
am
b9583756: am
8e52e15d: Merge "Bump generic_mips system partition size."
* commit '
b9583756eecda3dbad41b83fcba51ef7c07ac907':
Bump generic_mips system partition size.
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
Yohann Roussel [Thu, 5 Mar 2015 17:35:05 +0000 (18:35 +0100)]
Turn off Jack warnings by default
Change-Id: I24b3135395483b3581d212cb2ab1bb93ba2524d9
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>
The Android Automerger [Fri, 20 Mar 2015 13:06:23 +0000 (06:06 -0700)]
"LKY79"
The Android Automerger [Fri, 20 Mar 2015 13:05:07 +0000 (06:05 -0700)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
Narayan Kamath [Fri, 20 Mar 2015 09:23:50 +0000 (09:23 +0000)]
am
4de176b8: am
2002102e: am
ad22a8f2: Merge "Remove VoiceDialer from PRODUCT_PACKAGE list."
* commit '
4de176b888f7dda32e1a3d01fb9add7a1774f080':
Remove VoiceDialer from PRODUCT_PACKAGE list.