tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
21598 commits 1 branch 0 tags 119 MiB
Commit graph

21598 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bart Sears
c3868ae371 resolved conflicts for merge of 6d607ee7 to lmp-mr1-dev-plus-aosp 
Change-Id: I0a49bf5492cd5c1b03cf8cddd219db326d586909
 2015-03-26 18:03:17 -07:00
Ying Wang
1c10f07572 am abba8a91: am fcf0b138: am ad54a4da: Add selinux and verity support to custom image generation. 
* commit 'abba8a9117682f064dcc5c9ffb71fe38352a7918':
 2015-03-27 00:52:58 +00:00
The Android Automerger
0376271da3 am c3196186: (-s ours) am 91fbe4de: "LKY80" 
* commit 'c3196186383e9071753ef50108dbb1f3eb73ecce':
  "LKY80"
 2015-03-27 00:52:57 +00:00
Bart Sears
6d607ee7b0 am 1ded630d: am 1c3bf5c3: DO NOT MERGE - Bump version to 5.1.1 
* commit '1ded630dec3ea9450c702d7250f0807af7c47cbb':
  DO NOT MERGE - Bump version to 5.1.1
 2015-03-27 00:43:41 +00:00
Ying Wang
abba8a9117 am fcf0b138: am ad54a4da: Add selinux and verity support to custom image generation. 
* commit 'fcf0b1383999ce1da2ee9117884e31ca6620253b':
 2015-03-27 00:43:40 +00:00
Bart Sears
1ded630dec am 1c3bf5c3: DO NOT MERGE - Bump version to 5.1.1 
* commit '1c3bf5c39d281be4b437bc1a367c49b72c6e10b9':
  DO NOT MERGE - Bump version to 5.1.1
 2015-03-27 00:35:28 +00:00
Ying Wang
fcf0b13839 am ad54a4da: Add selinux and verity support to custom image generation. 
* commit 'ad54a4dab520d84f76c9ad6a83be92b5563de24e':
  Add selinux and verity support to custom image generation.
 2015-03-27 00:33:25 +00:00
Ying Wang
e6b9f28691 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
 2015-03-26 23:37:47 +00:00
Ying Wang
bc9ade722f 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
 2015-03-26 23:30:42 +00:00
Ying Wang
d5415dc778 Merge "Fix: exit code is 0 even when check-boot-jars.py fails" 2015-03-26 23:25:32 +00:00
The Android Automerger
b595d5a330 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"
  ...
 2015-03-26 21:09:39 +00:00
The Android Automerger
c319618638 am 91fbe4de: "LKY80" 
* commit '91fbe4de4628cc993e8fe20d1cd4c84805ea61c7':
  "LKY80"
 2015-03-26 21:00:05 +00:00
The Android Automerger
a2ef9dd1f9 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"
  ...
 2015-03-26 21:00:01 +00:00
Ying Wang
52ea2066a1 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.
 2015-03-26 17:57:22 +00:00
Ying Wang
abc748c11c 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.
 2015-03-26 17:50:10 +00:00
Ying Wang
6ff1b03572 Merge "Support to build image of root file system with /system and ramdisk combined." 2015-03-26 17:36:07 +00:00
Ying Wang
a2292c94d1 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 0eabd4f2c5)

Bug:19868522
Change-Id: Iafc467a0e3427b0d6ad3b575abcc98ddcc9ea0f1
 2015-03-26 10:35:00 -07:00
Richard Uhler
c801deac20 am 74b11051: am e7173cee: Merge "Store odex files in oat/<isa>/ directory." 
* commit '74b1105102ea00a30c516a06f8c5036d6ce44522':
  Store odex files in oat/<isa>/ directory.
 2015-03-26 15:11:26 +00:00
Richard Uhler
74b1105102 am e7173cee: Merge "Store odex files in oat/<isa>/ directory." 
* commit 'e7173cee108fe82b0469c456f69fe5a4160d5192':
  Store odex files in oat/<isa>/ directory.
 2015-03-26 15:04:43 +00:00
Richard Uhler
e7173cee10 Merge "Store odex files in oat/<isa>/ directory." 2015-03-26 14:57:33 +00:00
Jiyong Park
eb745aaf74 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
 2015-03-26 13:25:06 +09:00
Bart Sears
1c3bf5c39d DO NOT MERGE - Bump version to 5.1.1 
Bug: 19939307
Change-Id: I069f514fe6d3759aa7dde38627c54f7bed38c1bb
 2015-03-25 21:04:38 -07: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
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
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
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