Commit graph

22449 commits

Author SHA1 Message Date
Nicholas Sauer
c2400c3b85 Add classes.jack to the pdk build
Change-Id: I66ce6681976526b35f08cfe9b23bf1a3f12bccc6
2015-03-27 07:58:56 -07:00
Ying Wang
ac1da77e65 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
2015-03-26 23:51:07 +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
Baligh Uddin
6c0618976c Merge "Add bootsigner path as an option" 2015-03-26 23:03:13 +00:00
The Android Automerger
59fb4fb6d6 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"
  ...
2015-03-26 21:24:19 +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
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
David Riley
1c7151876a Merge "Add support to sign boot images with vboot." 2015-03-26 20:22:22 +00:00
Ying Wang
0137da4019 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.
2015-03-26 18:19:20 +00:00
Richard Uhler
f9910756dd am c801deac: am 74b11051: am e7173cee: Merge "Store odex files in oat/<isa>/ directory."
* commit 'c801deac20c6944095e2316bb4b97b3dc3e11446':
  Store odex files in oat/<isa>/ directory.
2015-03-26 18:19:19 +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
David Riley
17be3d3921 Add support to sign boot images with vboot.
Change-Id: I924468fe06f7d38d4fc49c2ae9dfee734fd58867
Signed-off-by: David Riley <davidriley@google.com>
(cherry picked from commit 14fb7236c1942a9f5050b3e608a0f5f4cd1cae1d)
2015-03-26 17:54:40 +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
bohu
bb49bc5417 Merge "Add fingerprint HAL to emulator system images" 2015-03-26 17:39:54 +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
Ying Wang
e11702b219 Merge "Support to build image of root file system with /system and ramdisk combined." 2015-03-26 17:34:00 +00:00
bohu
a2005ae47d 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
2015-03-26 10:16:42 -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
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
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
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