OSDN Git Service
Stephen Hines [Wed, 1 Apr 2015 19:09:58 +0000 (19:09 +0000)]
am
31f35975: am
9a98c47c: Merge "Don\'t warn on definition of possibly reserved identifiers."
* commit '
31f35975178e00c1178433bbbdefa0e27bee9750':
Don't warn on definition of possibly reserved identifiers.
Stephen Hines [Wed, 1 Apr 2015 18:59:07 +0000 (18:59 +0000)]
am
9a98c47c: Merge "Don\'t warn on definition of possibly reserved identifiers."
* commit '
9a98c47c64446e0c46f1d24f3d6526d177b62e14':
Don't warn on definition of possibly reserved identifiers.
Stephen Hines [Wed, 1 Apr 2015 18:50:28 +0000 (18:50 +0000)]
Merge "Don't warn on definition of possibly reserved identifiers."
Nick Kralevich [Wed, 1 Apr 2015 18:05:29 +0000 (18:05 +0000)]
am
4e94ed11: am
2d47488e: Merge "Drop BOARD_SEPOLICY_UNION."
* commit '
4e94ed11855e56ed498a2e7e83e312d5b691c5b9':
Drop BOARD_SEPOLICY_UNION.
Neil Fuller [Wed, 1 Apr 2015 18:05:28 +0000 (18:05 +0000)]
am
2e4c6762: am
2ff6a3bb: Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"
* commit '
2e4c67624c7f7d071d93d734cda024acea759582':
Add explicit dependency on tzdata_updates_intermediates for CTS
Nick Kralevich [Wed, 1 Apr 2015 17:54:46 +0000 (17:54 +0000)]
am
2d47488e: Merge "Drop BOARD_SEPOLICY_UNION."
* commit '
2d47488e675d0eb839ae6a7f9544cc64c50c68d2':
Drop BOARD_SEPOLICY_UNION.
Neil Fuller [Wed, 1 Apr 2015 17:54:44 +0000 (17:54 +0000)]
am
2ff6a3bb: Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"
* commit '
2ff6a3bbdf3a086e5e9a89e9acc66e8c5ae00539':
Add explicit dependency on tzdata_updates_intermediates for CTS
Nick Kralevich [Wed, 1 Apr 2015 17:47:10 +0000 (17:47 +0000)]
Merge "Drop BOARD_SEPOLICY_UNION."
Neil Fuller [Wed, 1 Apr 2015 17:43:54 +0000 (17:43 +0000)]
Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"
Tao Bao [Wed, 1 Apr 2015 17:15:29 +0000 (17:15 +0000)]
am
ae26f5b0: am
53602955: Merge "Add support to sign bootable images with vboot_signer"
* commit '
ae26f5b002de956d495c4019b365040490ff18dd':
Add support to sign bootable images with vboot_signer
Tao Bao [Wed, 1 Apr 2015 17:05:36 +0000 (17:05 +0000)]
am
53602955: Merge "Add support to sign bootable images with vboot_signer"
* commit '
536029551d31d8084c444063349291781ee43ae1':
Add support to sign bootable images with vboot_signer
Neil Fuller [Wed, 1 Apr 2015 17:02:46 +0000 (18:02 +0100)]
Add explicit dependency on tzdata_updates_intermediates for CTS
The build was working on AOSP, but fails downstream when using
Jack because the javalib.jar file needed by CTS is not being
built by default there.
Change-Id: I8dd836b33a4e1bae5af623db3822de99e9b05cf0
Dan Albert [Wed, 1 Apr 2015 16:59:48 +0000 (16:59 +0000)]
am
071af0ac: am
b8765797: Merge "Add unwinder linking to STL setup."
* commit '
071af0ac49ab87e4d365056a8ff764177f56b428':
Add unwinder linking to STL setup.
Dan Albert [Wed, 1 Apr 2015 16:59:46 +0000 (16:59 +0000)]
am
0ea16fcc: am
60335c03: Merge "Revert "Revert "Fix the libgcc/libatomic link order."""
* commit '
0ea16fcca3383bda04e873032d7721324ec90c42':
Revert "Revert "Fix the libgcc/libatomic link order.""
Tao Bao [Wed, 1 Apr 2015 16:54:44 +0000 (16:54 +0000)]
Merge "Add support to sign bootable images with vboot_signer"
Dan Albert [Wed, 1 Apr 2015 16:49:11 +0000 (16:49 +0000)]
am
b8765797: Merge "Add unwinder linking to STL setup."
* commit '
b8765797a89eebc97e38afcb94a965d69a8663ef':
Add unwinder linking to STL setup.
Dan Albert [Wed, 1 Apr 2015 16:49:10 +0000 (16:49 +0000)]
am
60335c03: Merge "Revert "Revert "Fix the libgcc/libatomic link order."""
* commit '
60335c03d7e897267eb20e0b0a6c7c864fd08b43':
Revert "Revert "Fix the libgcc/libatomic link order.""
Jeff Arneson [Wed, 1 Apr 2015 16:47:13 +0000 (16:47 +0000)]
am
05b3468b: am
6c46e0bf: Show annotation documentation on class details
* commit '
05b3468b1ea68450e4dc348c8b33a7eb3b34e7cc':
Show annotation documentation on class details
Dan Albert [Wed, 1 Apr 2015 16:40:21 +0000 (16:40 +0000)]
Merge "Add unwinder linking to STL setup."
Dan Albert [Wed, 1 Apr 2015 16:40:08 +0000 (16:40 +0000)]
Merge "Revert "Revert "Fix the libgcc/libatomic link order."""
Jeff Arneson [Wed, 1 Apr 2015 16:33:27 +0000 (16:33 +0000)]
am
6c46e0bf: Show annotation documentation on class details
* commit '
6c46e0bfe42f5ddfc3aa8ece645b4b244ced3a48':
Show annotation documentation on class details
Tao Bao [Mon, 30 Mar 2015 06:07:41 +0000 (23:07 -0700)]
Add support to sign bootable images with vboot_signer
Add vboot properties to the dictionary file, which will be packed into
the target_files zip. Add support in packaging and OTA scripts to
sign the generated bootable images (boot.img and recovery.img) when
vboot is enabled.
Change-Id: I08758ced03d173219415bca762bbdb66c464a9f5
(cherry picked from commit
5d5a3bd9e8d8b14b71d1b2105417a2958d13d3d2)
Stephen Smalley [Wed, 1 Apr 2015 14:30:10 +0000 (10:30 -0400)]
Drop BOARD_SEPOLICY_UNION.
As suggested in the comments on
https://android-review.googlesource.com/#/c/141560/
drop BOARD_SEPOLICY_UNION and simplify the build_policy logic.
Union all files found under BOARD_SEPOLICY_DIRS.
Change-Id: I4214893c999c23631f5456cb1b8edd59771ef13b
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Dan Albert [Tue, 31 Mar 2015 22:18:17 +0000 (15:18 -0700)]
Add unwinder linking to STL setup.
Previously we were bundling this into libc++ and having each binary
resolve its symbols from there. This means that the unwinder that gets
used for a given binary is sensitive to the order in which its
libraries are linked. Making this a static library dependency of each
binary means the right unwinder will always be used.
Bug:
18471342
Bug:
19958712
Change-Id: I782d212784dbf85355b5d9146d7460d675259a0e
Dan Albert [Tue, 31 Mar 2015 22:21:30 +0000 (15:21 -0700)]
Revert "Revert "Fix the libgcc/libatomic link order.""
This reverts commit
e440c3c07b26258139156075f0a51a9ad92eef75.
Jeff Arneson [Fri, 27 Mar 2015 22:32:06 +0000 (15:32 -0700)]
Show annotation documentation on class details
Also fix a bug where showAnnotations tags weren't appearing on
symbols without a javadoc
Bug:
19427762
Bug:
19931569
Change-Id: I4de8d5682acc438da69637262d8447695d6fb975
Neil Fuller [Tue, 31 Mar 2015 09:31:59 +0000 (09:31 +0000)]
am
2f78e36d: am
3cc6a0f2: Merge "Addition of a CTS suite for tzdata update code"
* commit '
2f78e36ddee92938a9dddd0484781037b5b496eb':
Addition of a CTS suite for tzdata update code
Neil Fuller [Tue, 31 Mar 2015 09:25:12 +0000 (09:25 +0000)]
am
3cc6a0f2: Merge "Addition of a CTS suite for tzdata update code"
* commit '
3cc6a0f22f285c3fd8fb7f0b6559dd24b43e6541':
Addition of a CTS suite for tzdata update code
Neil Fuller [Tue, 31 Mar 2015 08:30:50 +0000 (08:30 +0000)]
Merge "Addition of a CTS suite for tzdata update code"
Ying Wang [Tue, 31 Mar 2015 00:19:24 +0000 (00:19 +0000)]
am
62086971: am
d64b853a: Merge "Bump generic_mips64 system partition size."
* commit '
62086971c0616c325fd80ef172de1478ade52fbc':
Bump generic_mips64 system partition size.
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:24:39 +0000 (02:24 +0000)]
am
b6339d74: am
f1a8c8c5: Merge "Fix up a few callers of GetTypeAndDevice."
* commit '
b6339d74fe575aa9e824ebb593c3064555a7af28':
Fix up a few callers of GetTypeAndDevice.
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
Dan Albert [Fri, 27 Mar 2015 23:49:01 +0000 (16:49 -0700)]
Fix bad merge.
Change-Id: Ifdb2a2999fe13f770c239f47330e8c2c44fdfdbe
Chih-hung Hsieh [Fri, 27 Mar 2015 23:26:15 +0000 (23:26 +0000)]
am
1e9b11f4: am
d63c78e0: Merge "Allow -mcpu=cortex-a15 for clang"
* commit '
1e9b11f4b15982896a85cc70c25f6632395b4e29':
Allow -mcpu=cortex-a15 for clang
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 21:28:51 +0000 (14:28 -0700)]
resolved conflicts for merge of
4c32aa3d to lmp-mr1-dev-plus-aosp
Change-Id: I32a06c88416e68ce628f642e0d025d1df5e227d7
Ying Wang [Fri, 27 Mar 2015 21:09:39 +0000 (21:09 +0000)]
am
ddc5a8f7: am
8ffec13d: Merge "Add back Java resources to apk without Java code."
* commit '
ddc5a8f78c1e5a180bb23878b4f47b68a91f8ed9':
Add back Java resources to apk without Java code.
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:59:35 +0000 (16:59 +0000)]
am
55adb5a3: am
1b23b33d: Merge "MKBOOTIMG override were missing in two places"
* commit '
55adb5a380f801038c00b2e169d33b6da93dfacc':
MKBOOTIMG override were missing in two places
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"
Bart Sears [Fri, 27 Mar 2015 01:03:17 +0000 (18:03 -0700)]
resolved conflicts for merge of
6d607ee7 to lmp-mr1-dev-plus-aosp
Change-Id: I0a49bf5492cd5c1b03cf8cddd219db326d586909
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)]
Bart Sears [Fri, 27 Mar 2015 00:43:41 +0000 (00:43 +0000)]
am
1ded630d: am
1c3bf5c3: DO NOT MERGE - Bump version to 5.1.1
* commit '
1ded630dec3ea9450c702d7250f0807af7c47cbb':
DO NOT MERGE - Bump version to 5.1.1
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':
Bart Sears [Fri, 27 Mar 2015 00:35:28 +0000 (00:35 +0000)]
am
1c3bf5c3: DO NOT MERGE - Bump version to 5.1.1
* commit '
1c3bf5c39d281be4b437bc1a367c49b72c6e10b9':
DO NOT MERGE - Bump version to 5.1.1
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: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"
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"
...
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.
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
Neil Fuller [Fri, 13 Mar 2015 14:22:11 +0000 (14:22 +0000)]
Addition of a CTS suite for tzdata update code
Bug:
19941636
Change-Id: Id0985f8c5be2f12858ee8bf52acf52bdb2df8741
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
Bart Sears [Thu, 26 Mar 2015 04:04:38 +0000 (21:04 -0700)]
DO NOT MERGE - Bump version to 5.1.1
Bug:
19939307
Change-Id: I069f514fe6d3759aa7dde38627c54f7bed38c1bb
Stephen Hines [Tue, 17 Mar 2015 21:42:11 +0000 (14:42 -0700)]
Don't warn on definition of possibly reserved identifiers.
Change-Id: Icfcfa94aac0503c97dee0ff4d0cd49107201526d
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."
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: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
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)