Commit graph

22682 commits

Author SHA1 Message Date
Christopher Ferris
c44299e6b9 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."
2015-03-25 21:08:26 +00:00
Ying Wang
896a1cb0d9 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.
2015-03-25 21:08:24 +00:00
Christopher Ferris
9226f8fc3b 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."
2015-03-25 18:58:54 +00:00
Ying Wang
335b191800 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.
2015-03-25 18:58:52 +00:00
Christopher Ferris
07aa4c1fee 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."
2015-03-25 18:50:10 +00:00
Ying Wang
5a8f70678b 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.
2015-03-25 18:50:07 +00:00
Christopher Ferris
a45223b635 Merge "Revert "Switch x86 and x86_64 to 4.9. Attempt #2."" 2015-03-25 18:28:53 +00:00
Christopher Ferris
c9d2952e1e Revert "Switch x86 and x86_64 to 4.9. Attempt #2."
This reverts commit 6fb735b071.

Change-Id: I64b868cdfb3571de5e8b01e4257b5dfa9ee44d0d
2015-03-25 18:27:21 +00:00
Ying Wang
e9b15e2ccd Merge "Switch x86 and x86_64 to 4.9. Attempt #2." 2015-03-25 18:11:54 +00:00
Bernhard Rosenkränzer
a24a9a8e62 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>
2015-03-25 16:59:46 +01:00
Per Astrand
cab6699160 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
2015-03-25 16:02:50 +01:00
Ying Wang
0eabd4f2c5 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
2015-03-24 21:07:42 -07:00
Dan Albert
8b72aefb5a 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
2015-03-24 11:05:16 -07:00
Dan Albert
30b5e49796 am 220a0332: am c47f47b7: am 5d60719e: Merge "Run ZipFile.testzip() during zipfile tests."
* commit '220a0332d318d0dcf7d3611c78084e066ada8e54':
  Run ZipFile.testzip() during zipfile tests.
2015-03-24 03:25:31 +00:00
Tao Bao
b5f5bd6e1b am 3e88a16b: am 2d139fcf: am 0488079d: Merge "Fix the computation of basefilename"
* commit '3e88a16b0e5eb0896d52b5c4e3488527d9a95f26':
  Fix the computation of basefilename
2015-03-24 03:25:24 +00:00
Greg Hackmann
6f2e506b31 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
2015-03-24 02:59:31 +00:00
Ying Wang
667a6ec900 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.
2015-03-24 02:57:28 +00:00
Tao Bao
228d947832 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
2015-03-24 01:30:59 +00:00
Dan Albert
220a0332d3 am c47f47b7: am 5d60719e: Merge "Run ZipFile.testzip() during zipfile tests."
* commit 'c47f47b74f6ed6daa83e3f4357cf315a4b617f6e':
  Run ZipFile.testzip() during zipfile tests.
2015-03-24 00:18:47 +00:00
Dan Albert
c47f47b74f am 5d60719e: Merge "Run ZipFile.testzip() during zipfile tests."
* commit '5d60719e42fdc0d007920d946f1c1bb440cedab7':
  Run ZipFile.testzip() during zipfile tests.
2015-03-24 00:12:27 +00:00
Dan Albert
5d60719e42 Merge "Run ZipFile.testzip() during zipfile tests." 2015-03-24 00:07:02 +00:00
Tao Bao
3e88a16b0e am 2d139fcf: am 0488079d: Merge "Fix the computation of basefilename"
* commit '2d139fcf2916ad6d0008cf32a2fc1c2899eda3ff':
  Fix the computation of basefilename
2015-03-23 23:58:49 +00:00
Tao Bao
2d139fcf29 am 0488079d: Merge "Fix the computation of basefilename"
* commit '0488079dfa5d5e53198125934eeaefa9cf1e7047':
  Fix the computation of basefilename
2015-03-23 23:54:55 +00:00
Dan Albert
d6d1beb88c 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
2015-03-23 16:54:39 -07:00
Tao Bao
0488079dfa Merge "Fix the computation of basefilename" 2015-03-23 23:49:00 +00:00
Tao Bao
eaf885b1d0 Fix the computation of basefilename
Change-Id: I156b182414ef5b33611955cbc019e208c771013a
2015-03-23 16:05:26 -07:00
Brian Carlstrom
e84a275061 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
2015-03-23 22:55:30 +00:00
Mathieu Chartier
0626a6421e 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
2015-03-23 22:55:28 +00:00
Paul Miller
99fbd82028 am 5bd58691: am 23588104: am 971e5787: Merge "Revert "Replace legacy Browser with BookmarkProvider""
* commit '5bd5869115fa80cc4a94752e160d3df001d6d3d6':
  Revert "Replace legacy Browser with BookmarkProvider"
2015-03-23 22:55:27 +00:00
Ying Wang
1331c33b92 am 8200eff9: am 00391a43: am 082184e7: Merge "Bump generic_arm64 system partition size."
* commit '8200eff9a3cf6f0ddaf80897f7a38297bd7ed009':
  Bump generic_arm64 system partition size.
2015-03-23 22:55:26 +00:00
Greg Hackmann
3b88235d04 am 9f201b18: am 088521ef: Merge "Allow system images larger than 2GiB, pt. 2"
* commit '9f201b18be8a4cecd27d7b5635c0892fbb00c591':
  Allow system images larger than 2GiB, pt. 2
2015-03-23 22:03:08 +00:00
Greg Hackmann
9f201b18be am 088521ef: Merge "Allow system images larger than 2GiB, pt. 2"
* commit '088521ef906346e06ce39c877ff142c2467e3a79':
  Allow system images larger than 2GiB, pt. 2
2015-03-23 21:55:50 +00:00
Greg Hackmann
088521ef90 Merge "Allow system images larger than 2GiB, pt. 2" 2015-03-23 21:49:31 +00:00
Greg Hackmann
6701db8145 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>
2015-03-23 14:35:50 -07:00
Ying Wang
c85af62429 am 743b9f49: am ad54a4da: Add selinux and verity support to custom image generation.
* commit '743b9f498b68af1c70eec8e7ca7055a9c23ce6f5':
  Add selinux and verity support to custom image generation.
2015-03-23 18:02:30 +00:00
Ying Wang
743b9f498b am ad54a4da: Add selinux and verity support to custom image generation.
* commit 'ad54a4dab520d84f76c9ad6a83be92b5563de24e':
  Add selinux and verity support to custom image generation.
2015-03-23 17:55:09 +00:00
Ying Wang
ad54a4dab5 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 7d51a40295)
2015-03-23 17:50:16 +00:00
Ying Wang
7d51a40295 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
2015-03-23 10:04:56 -07:00
Yohann Roussel
52f8c6c8f0 Merge "Turn off Jack warnings by default" 2015-03-23 14:18:27 +00:00
Tao Bao
45aece2233 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
2015-03-23 03:43:30 +00:00
Tao Bao
62eed4d8a9 am b5901670: Merge "Fix the syntax error in the edify script generator"
* commit 'b59016703a540a541a94e352c1ef54442a0e95dd':
  Fix the syntax error in the edify script generator
2015-03-23 03:35:56 +00:00
Tao Bao
b59016703a Merge "Fix the syntax error in the edify script generator" 2015-03-23 03:29:58 +00:00
Tao Bao
3910ebf468 Fix the syntax error in the edify script generator
file_getprop() always expects two arguments.

Bug: 19881931
Change-Id: Icf5577ad34188991c03f68c1217642d3adc4201c
2015-03-22 14:20:48 -07:00
The Android Automerger
91fbe4de46 "LKY80" 2015-03-21 06:05:46 -07:00
The Android Automerger
1a10d739a7 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-21 06:05:08 -07:00
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
Brian Carlstrom
3ba88e7d2d 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
2015-03-20 22:09:36 +00:00
Brian Carlstrom
b7fe2e622d am f7683b81: Merge "Clearly explain that 32-bit x86 is not supported"
* commit 'f7683b813a7f71313f3dd1f71be1a8ef9d800ebf':
  Clearly explain that 32-bit x86 is not supported
2015-03-20 22:02:49 +00:00
Mathieu Chartier
783a632f45 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
2015-03-20 21:58:48 +00:00