OSDN Git Service
Fabrice Di Meglio [Tue, 31 Mar 2015 00:20:11 +0000 (00:20 +0000)]
Merge "Add IntentFilterVerifier to the build"
Dan Albert [Sat, 28 Mar 2015 02:38:22 +0000 (02:38 +0000)]
am
146366bf: am
b6339d74: am
f1a8c8c5: Merge "Fix up a few callers of GetTypeAndDevice."
* commit '
146366bfb28e6f7c7b785188325fab40c4db000a':
Fix up a few callers of GetTypeAndDevice.
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 [Sat, 28 Mar 2015 00:02:13 +0000 (00:02 +0000)]
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:49:27 +0000 (23:49 +0000)]
am
29b415aa: am
1e9b11f4: am
d63c78e0: Merge "Allow -mcpu=cortex-a15 for clang"
* commit '
29b415aa7781b27fc4948307acc5961cd702dac2':
Allow -mcpu=cortex-a15 for clang
Dan Albert [Fri, 27 Mar 2015 23:37:23 +0000 (16:37 -0700)]
resolved conflicts for merge of
eecf00db to master
Change-Id: I7f268122c10152aff8ef59622edbba88db427fca
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
Ying Wang [Fri, 27 Mar 2015 23:18:13 +0000 (23:18 +0000)]
am
f6dfd7b6: am
ddc5a8f7: am
8ffec13d: Merge "Add back Java resources to apk without Java code."
* commit '
f6dfd7b608f4e53b83dcb0713447f3040a0790f2':
Add back Java resources to apk without Java code.
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 18:17:11 +0000 (18:17 +0000)]
Merge "Add back Java resources to apk without Java code."
Nicholas Sauer [Fri, 27 Mar 2015 18:16:22 +0000 (18:16 +0000)]
Merge "Remove mms-common from tiny and minimal builds to fix the pdk build."
Nicholas Sauer [Fri, 27 Mar 2015 18:16:03 +0000 (18:16 +0000)]
Merge "Add required projects to pdk build on "
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.
Bug:
19947218
Change-Id: I0e1a65a9cbe656974f8ef3923b2f15e9efa5feb9
Nicholas Sauer [Fri, 27 Mar 2015 18:02:41 +0000 (18:02 +0000)]
Merge "Add classes.jack to the pdk build"
Nicholas Sauer [Fri, 27 Mar 2015 16:21:36 +0000 (09:21 -0700)]
Remove mms-common from tiny and minimal builds to fix the pdk build.
mms-common was replaced with telephony-common over several CLs including
ag/496311. the current mms-common project is merely a dummy class used
to satisfy legacy build targets. i confirmed with ywen@ that it is no
longer needed.
Change-Id: I70302abe4d1312847341bbda4976c489af2e32e3
Ying Wang [Fri, 27 Mar 2015 17:15:46 +0000 (17:15 +0000)]
am
8853f518: am
55adb5a3: am
1b23b33d: Merge "MKBOOTIMG override were missing in two places"
* commit '
8853f5181b1ae1682d9433c28e120f25f63a4721':
MKBOOTIMG override were missing in two places
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"
Nicholas Sauer [Fri, 27 Mar 2015 16:26:27 +0000 (09:26 -0700)]
Add required projects to pdk build on master.
Added:
-android.test.runner_intermediates
-android-common_intermediates
-bouncycastle_intermediates
-conscrypt_intermediates
-okhttp_intermediates
Removed:
-mms-common_intermediates (which was deprecated)
Also, alphabetize the list.
Change-Id: Ida5ef79b7176edfe006f50d224bcd64b75843832
Nicholas Sauer [Thu, 26 Mar 2015 20:36:13 +0000 (13:36 -0700)]
Add classes.jack to the pdk build
Change-Id: I66ce6681976526b35f08cfe9b23bf1a3f12bccc6
Bart Sears [Fri, 27 Mar 2015 01:25:58 +0000 (01:25 +0000)]
am
c3868ae3: (-s ours) resolved conflicts for merge of
6d607ee7 to lmp-mr1-dev-plus-aosp
* commit '
c3868ae37130a6c1c1a650d78bc26f394439d796':
DO NOT MERGE - Bump version to 5.1.1
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)]
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: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
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
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."
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
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 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 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