OSDN Git Service
Colin Cross [Thu, 8 Dec 2016 23:52:01 +0000 (23:52 +0000)]
Merge "Pass eng product varible to soong" am:
b39165d5df
am:
c645e17388
Change-Id: Id4a4d650d784a55d26b3d3aa22111c4dc5acde84
Colin Cross [Thu, 8 Dec 2016 23:47:04 +0000 (23:47 +0000)]
Merge "Pass eng product varible to soong"
am:
b39165d5df
Change-Id: I88acb79aaa12ec9ea2ac0847abf7f8406ccb479d
Colin Cross [Thu, 8 Dec 2016 23:42:16 +0000 (23:42 +0000)]
Merge "Pass eng product varible to soong"
Adam Seaton [Thu, 8 Dec 2016 19:25:17 +0000 (19:25 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac am:
4e1976ff9b am:
7a2ca27f87 am:
31bc4666be -s ours am:
80d094259e am:
ab8c6b7e33 am:
920376a35a
am:
5260c53a72
Change-Id: Ic5680e80d403f77c5b45d59d74139f142572bb2f
Adam Seaton [Thu, 8 Dec 2016 19:25:10 +0000 (19:25 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7 am:
6083d8337c am:
e76d1419c7 am:
0c30223c15 -s ours am:
4758581371 am:
7ab9da0e3e am:
39fc3e057b
am:
d23021bb6a
Change-Id: I5209e73495eae704c1a1ce9441f556ed37624561
Adam Seaton [Thu, 8 Dec 2016 19:20:16 +0000 (19:20 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac am:
4e1976ff9b am:
7a2ca27f87 am:
31bc4666be -s ours am:
80d094259e am:
ab8c6b7e33
am:
920376a35a
Change-Id: I9eb5927b353df59bc2f4d6ca9b8b0959fa605185
Adam Seaton [Thu, 8 Dec 2016 19:20:10 +0000 (19:20 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7 am:
6083d8337c am:
e76d1419c7 am:
0c30223c15 -s ours am:
4758581371 am:
7ab9da0e3e
am:
39fc3e057b
Change-Id: I3319a70c835fcc6f4caec0f0f331c80b0bfff849
Adam Seaton [Thu, 8 Dec 2016 19:16:48 +0000 (19:16 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac am:
4e1976ff9b am:
7a2ca27f87 am:
31bc4666be -s ours am:
80d094259e
am:
ab8c6b7e33
Change-Id: I08505a341bce3869628b6f09157332bf5bb0d1d5
Adam Seaton [Thu, 8 Dec 2016 19:16:40 +0000 (19:16 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7 am:
6083d8337c am:
e76d1419c7 am:
0c30223c15 -s ours am:
4758581371
am:
7ab9da0e3e
Change-Id: Icc44a43eefe8db0fcd9191b10ce6e2517ce56f99
Adam Seaton [Thu, 8 Dec 2016 19:11:15 +0000 (19:11 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac am:
4e1976ff9b am:
7a2ca27f87 am:
31bc4666be -s ours
am:
80d094259e
Change-Id: I90763143c525a186c503abccc6f710fb851d72b6
Adam Seaton [Thu, 8 Dec 2016 19:11:10 +0000 (19:11 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7 am:
6083d8337c am:
e76d1419c7 am:
0c30223c15 -s ours
am:
4758581371
Change-Id: Ib67b4e7043da863341e0e9d2f79a3e9fed0a7351
Adam Seaton [Thu, 8 Dec 2016 19:06:44 +0000 (19:06 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac am:
4e1976ff9b am:
7a2ca27f87
am:
31bc4666be -s ours
Change-Id: I0ec36bbce6a7ec254360eb3133f99813b5de5aa0
Adam Seaton [Thu, 8 Dec 2016 19:06:39 +0000 (19:06 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7 am:
6083d8337c am:
e76d1419c7
am:
0c30223c15 -s ours
Change-Id: I9a6046de21e024e5f3378047411e5270881aa2d3
Adam Seaton [Thu, 8 Dec 2016 19:02:14 +0000 (19:02 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac am:
4e1976ff9b
am:
7a2ca27f87
Change-Id: Iafe15e8f02674cf82a933464256e0d1d14549c3f
Adam Seaton [Thu, 8 Dec 2016 19:02:09 +0000 (19:02 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7 am:
6083d8337c
am:
e76d1419c7
Change-Id: I376173b292e1e26c5de1147312caa94f0a531af1
Adam Seaton [Thu, 8 Dec 2016 18:57:13 +0000 (18:57 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac
am:
4e1976ff9b
Change-Id: I1e2194c66c28220d6f8d2c2b8f12e63f420dc39b
Adam Seaton [Thu, 8 Dec 2016 18:57:09 +0000 (18:57 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7
am:
6083d8337c
Change-Id: I1f2345cf0ebce7f0124cc235a4bdeee8e9c32dfc
Adam Seaton [Thu, 8 Dec 2016 18:53:13 +0000 (18:53 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev
am:
06e7d1f2ac
Change-Id: I964c1abe8c27142f30b570877681e13dd38d4aca
Adam Seaton [Thu, 8 Dec 2016 18:53:08 +0000 (18:53 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev
am:
f92880e0c7
Change-Id: Ib50d3f7d336d9e6b6f7edcac63c8927fc17aa780
Colin Cross [Thu, 8 Dec 2016 18:05:55 +0000 (10:05 -0800)]
Pass eng product varible to soong
Test: mmma -j frameworks/compile/libbcc
Change-Id: I79a903528948b728f730385a9de5e431617ff257
Adam Seaton [Wed, 7 Dec 2016 22:58:43 +0000 (14:58 -0800)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev
Change-Id: Iefaf98b1fe24e70f1262a432b6edc792383acf8e
Adam Seaton [Wed, 7 Dec 2016 22:57:17 +0000 (14:57 -0800)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev
Change-Id: I4563c5d9176d690676402f671971e46a484cadc0
Andreas Gampe [Wed, 7 Dec 2016 17:44:42 +0000 (17:44 +0000)]
Merge "Build: Skip JNI lib symlink in second-stage build" am:
6d4123aeb8
am:
2017f8dcd5
Change-Id: I0a41ecd96b1ff2348fe66a1e349288d02927a8c1
Andreas Gampe [Wed, 7 Dec 2016 17:40:41 +0000 (17:40 +0000)]
Merge "Build: Skip JNI lib symlink in second-stage build"
am:
6d4123aeb8
Change-Id: I38f45b7466015234de8bbe2a5ed1b3e9cfda3582
Treehugger Robot [Wed, 7 Dec 2016 17:35:53 +0000 (17:35 +0000)]
Merge "Build: Skip JNI lib symlink in second-stage build"
Pat Tjin [Wed, 7 Dec 2016 07:15:44 +0000 (07:15 +0000)]
Merge "build_image: add support for specifying number of inodes" am:
c5fd94f2c3
am:
ad47e9ff84
Change-Id: I8deedae7be71ac3eda13b109447799919861132b
Pat Tjin [Wed, 7 Dec 2016 07:12:11 +0000 (07:12 +0000)]
Merge "build_image: add support for specifying number of inodes"
am:
c5fd94f2c3
Change-Id: Ief00b12390472ff6f7c206fe9652fd687f47ffcc
Pat Tjin [Wed, 7 Dec 2016 07:07:25 +0000 (07:07 +0000)]
Merge "build_image: add support for specifying number of inodes"
Patrick Tjin [Thu, 20 Oct 2016 17:58:12 +0000 (10:58 -0700)]
build_image: add support for specifying number of inodes
Add support for specifying number of inodes when creating
system, vendor, oem partitions. These are all read-only
and have no use for extra inodes. Removing extra inodes
saves a lot of space.
Bug:
32246383
Change-Id: I13f1d4614b64a4abc752c42a1c65d3d151481c21
(cherry picked from commit
b59eca358603a4174d4f7c9b70749e7cd0e6f3fe)
bowgotsai [Wed, 7 Dec 2016 03:30:30 +0000 (03:30 +0000)]
Merge "custom_image: fix build break" am:
52897d4ecb
am:
ab0ae8e728
Change-Id: I20aa30f30bafcfb49b39c0d69b87ed5e7e4ecae5
bowgotsai [Wed, 7 Dec 2016 03:26:30 +0000 (03:26 +0000)]
Merge "custom_image: fix build break"
am:
52897d4ecb
Change-Id: I40f0d7c6f935e33f7d076313d86df25fb5199087
Treehugger Robot [Wed, 7 Dec 2016 03:20:12 +0000 (03:20 +0000)]
Merge "custom_image: fix build break"
Andreas Gampe [Wed, 7 Dec 2016 01:56:29 +0000 (17:56 -0800)]
Build: Skip JNI lib symlink in second-stage build
When creating a sanitized image, skip creating JNI library
symlinks in the second round.
Bug:
33279120
Test: m && m SANITIZE_TARGET=address & ls -l $OUT/system/app/NfcNci/lib/*
Change-Id: Ib5eace9a49eb8b693603ba5cc59e392d575c44e3
Benoit Lamarche [Tue, 6 Dec 2016 15:58:15 +0000 (15:58 +0000)]
Merge "Disable Jack's NNode cache" am:
3c731228ba
am:
fcf364b15a
Change-Id: Id19d1caf7ce00809f907dbca51fed607ebbe3f2d
Benoit Lamarche [Tue, 6 Dec 2016 15:54:45 +0000 (15:54 +0000)]
Merge "Disable Jack's NNode cache"
am:
3c731228ba
Change-Id: Iea59e0c4cd0fa11277913d70a9de698565ae13fc
Benoit Lamarche [Tue, 6 Dec 2016 15:47:34 +0000 (15:47 +0000)]
Merge "Disable Jack's NNode cache"
Benoit Lamarche [Tue, 6 Dec 2016 14:00:03 +0000 (15:00 +0100)]
Disable Jack's NNode cache
Test: N/A
Bug:
33367537
Change-Id: Idf7a518dfcbf5665917465b1ae2f0e09f4532688
Benoit Lamarche [Tue, 6 Dec 2016 11:11:58 +0000 (11:11 +0000)]
resolve merge conflicts of
e04c941 to stage-aosp-master
am:
0e61b46673
Change-Id: I988764ab18ddd8ae3219c0c4c73b4b92e7e83abb
Benoit Lamarche [Tue, 6 Dec 2016 10:32:41 +0000 (11:32 +0100)]
resolve merge conflicts of
e04c941 to stage-aosp-master
Change-Id: I92ca7c5a10532220031dc799ad8900c9b20dc6fe
Benoit Lamarche [Tue, 6 Dec 2016 10:16:25 +0000 (10:16 +0000)]
Merge "Set platform min sdk for Jack to o-b1"
bowgotsai [Tue, 6 Dec 2016 09:30:44 +0000 (17:30 +0800)]
custom_image: fix build break
Fix build break caused by
https://android-review.googlesource.com/#/c/305575/.
Bug:
33358681
Test: make custom_images
Change-Id: I1ba7cf61491c8593b20bdac58e984f1928697b8c
Dan Willemsen [Tue, 6 Dec 2016 03:36:34 +0000 (03:36 +0000)]
Merge "Tell Soong about TARGET_COPY_OUT_VENDOR" am:
47b0322534
am:
0deb783a52
Change-Id: Icb3d257945201bdfdff1fb562d06faf3c009788d
Dan Willemsen [Tue, 6 Dec 2016 03:32:05 +0000 (03:32 +0000)]
Merge "Tell Soong about TARGET_COPY_OUT_VENDOR"
am:
47b0322534
Change-Id: I55ac26073caf34173f6c051f87e10b651c23589b
Treehugger Robot [Tue, 6 Dec 2016 03:27:00 +0000 (03:27 +0000)]
Merge "Tell Soong about TARGET_COPY_OUT_VENDOR"
Dan Willemsen [Tue, 6 Dec 2016 02:34:58 +0000 (02:34 +0000)]
Merge "Remove aidl, proto, objc from soong_problems" am:
bbc072f716
am:
55b1651181
Change-Id: Ia18925f8aebf81bcd8707d29f88eef5fa7b6cee0
Dan Willemsen [Tue, 6 Dec 2016 02:32:30 +0000 (02:32 +0000)]
Merge "Remove aidl, proto, objc from soong_problems"
am:
bbc072f716
Change-Id: Ifba3b1ebb0e9ca018495fc1f93104823d51a516e
Treehugger Robot [Tue, 6 Dec 2016 02:28:35 +0000 (02:28 +0000)]
Merge "Remove aidl, proto, objc from soong_problems"
Dan Willemsen [Tue, 6 Dec 2016 02:28:30 +0000 (02:28 +0000)]
Merge "Soong now exports AIDL_CPP" am:
06a2daac72
am:
f1e23b77f4
Change-Id: I0aa93e2a1eb2803b46c70019eee23d08a47b4c9d
Dan Willemsen [Tue, 6 Dec 2016 02:25:36 +0000 (02:25 +0000)]
Merge "Soong now exports AIDL_CPP"
am:
06a2daac72
Change-Id: I704c568b71cd95c6a17545d6694095b72e5c097c
Treehugger Robot [Tue, 6 Dec 2016 02:20:39 +0000 (02:20 +0000)]
Merge "Soong now exports AIDL_CPP"
Dan Willemsen [Tue, 6 Dec 2016 01:46:14 +0000 (17:46 -0800)]
Tell Soong about TARGET_COPY_OUT_VENDOR
So that it can properly install proprietary components in system/vendor/
or vendor/
Test: lunch aosp_arm-eng; m -j vulkan.default
Test: lunch aosp_flounder-eng; m -j vulkan.default
Change-Id: I98384d2b4f09c3b5de2ed04417880f366828234e
Dan Willemsen [Tue, 6 Dec 2016 00:38:14 +0000 (16:38 -0800)]
Remove aidl, proto, objc from soong_problems
We support these in Soong now, so stop marking them in soong_to_convert.
Test: Compare soong_to_convert.txt
Change-Id: I89befdfd8c4eaa04ab626d8be090765a1b879d8b
Dan Willemsen [Mon, 5 Dec 2016 23:16:38 +0000 (15:16 -0800)]
Soong now exports AIDL_CPP
So remove it here.
Test: mmma -j system/tools/aidl
Change-Id: Ia92ce6499881c1aec42900fcfdb4e790a67b62b5
Adrien Schildknecht [Sat, 3 Dec 2016 04:12:53 +0000 (04:12 +0000)]
Manually merge commit '
c13da91' into stage-aosp-master
am:
ada51f3b8f
Change-Id: Idc324a9e89bd4bf7e099395a72b5868d7040d545
The Android Automerger [Sat, 3 Dec 2016 04:02:09 +0000 (04:02 +0000)]
Manually merge commit '
c13da91' into stage-aosp-master
* commit '
c13da91':
Add support for creating ext4 images with mke2fs
BUG:
33304034
Treehugger Robot [Fri, 2 Dec 2016 22:48:21 +0000 (22:48 +0000)]
Merge "Add support for creating ext4 images with mke2fs"
dcashman [Fri, 2 Dec 2016 22:40:54 +0000 (22:40 +0000)]
Merge "Sort SELinux package inclusion." am:
15e1b5e239
am:
d1b032237a
Change-Id: Ie3aaaa4ea5963c405b5363cf3258b3817390640a
dcashman [Fri, 2 Dec 2016 22:36:28 +0000 (22:36 +0000)]
Merge "Sort SELinux package inclusion."
am:
15e1b5e239
Change-Id: I2411d85662baf7278d34955bd6eb7ae6938b1956
Treehugger Robot [Fri, 2 Dec 2016 22:25:42 +0000 (22:25 +0000)]
Merge "Sort SELinux package inclusion."
Colin Cross [Fri, 2 Dec 2016 22:09:27 +0000 (22:09 +0000)]
Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES" am:
1498712a6b
am:
51c1eeefb3
Change-Id: I5e05a8d69bc1bf02e8831333a1bbe483e13e3227
Colin Cross [Fri, 2 Dec 2016 22:00:26 +0000 (22:00 +0000)]
Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES"
am:
1498712a6b
Change-Id: Iec7d58d837879bc4a63818d09881873f56d14779
Colin Cross [Fri, 2 Dec 2016 21:47:57 +0000 (21:47 +0000)]
Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES"
dcashman [Fri, 2 Dec 2016 17:32:15 +0000 (09:32 -0800)]
Sort SELinux package inclusion.
This section will be modified as part of splitting these packages into platform
and non-platform components. Sort them all to avoid conflicts.
Bug:
31363362
Test: Builds
Change-Id: I91fb4d4d7c0a6971a19047ef2eb2981770a122ff
Marco Nelissen [Fri, 2 Dec 2016 17:07:23 +0000 (17:07 +0000)]
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am:
198262ff83 -s ours am:
953a9eb3d3 am:
14d24b3d5f -s ours am:
0d45d96082 am:
6f45a5f721 am:
22b2728055 am:
37d1ec0632 -s ours am:
f8dc0c9dc5 am:
c65b6de802 am:
56aa9f17ba
am:
6127b67b64
Change-Id: Ie604d50be0d1805595005eadf49457fca95126f0
Marco Nelissen [Fri, 2 Dec 2016 17:07:06 +0000 (17:07 +0000)]
DO NOT MERGE increase generic_mips system partition am:
7824073a36 -s ours am:
0c041e9ada am:
29ee191947 -s ours am:
16ee67f1a7 am:
8fc84f4de0 am:
7474d313f9 am:
ac0ca8f326 -s ours am:
58c4e2e48a am:
32711700ab am:
38ae17c46d
am:
85e78564d3
Change-Id: I5ae4cfc8f552b8f9bc94a3546d037ebd716a3d5a
Marco Nelissen [Fri, 2 Dec 2016 17:00:23 +0000 (17:00 +0000)]
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am:
198262ff83 -s ours am:
953a9eb3d3 am:
14d24b3d5f -s ours am:
0d45d96082 am:
6f45a5f721 am:
22b2728055 am:
37d1ec0632 -s ours am:
f8dc0c9dc5 am:
c65b6de802
am:
56aa9f17ba
Change-Id: I323162303f0d7d86d6de82aba740fbd50728714f
Marco Nelissen [Fri, 2 Dec 2016 17:00:05 +0000 (17:00 +0000)]
DO NOT MERGE increase generic_mips system partition am:
7824073a36 -s ours am:
0c041e9ada am:
29ee191947 -s ours am:
16ee67f1a7 am:
8fc84f4de0 am:
7474d313f9 am:
ac0ca8f326 -s ours am:
58c4e2e48a am:
32711700ab
am:
38ae17c46d
Change-Id: I2f4d64808446f39ef201b6629eeae432276ead6c
Marco Nelissen [Fri, 2 Dec 2016 16:53:19 +0000 (16:53 +0000)]
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am:
198262ff83 -s ours am:
953a9eb3d3 am:
14d24b3d5f -s ours am:
0d45d96082 am:
6f45a5f721 am:
22b2728055 am:
37d1ec0632 -s ours am:
f8dc0c9dc5
am:
c65b6de802
Change-Id: I76291a36fa5fb74d081432d97c681eafde2caefe
Marco Nelissen [Fri, 2 Dec 2016 16:53:05 +0000 (16:53 +0000)]
DO NOT MERGE increase generic_mips system partition am:
7824073a36 -s ours am:
0c041e9ada am:
29ee191947 -s ours am:
16ee67f1a7 am:
8fc84f4de0 am:
7474d313f9 am:
ac0ca8f326 -s ours am:
58c4e2e48a
am:
32711700ab
Change-Id: I0c8041004cd52112234e1ef368bf501262a6668c
Tao Bao [Fri, 2 Dec 2016 16:53:04 +0000 (16:53 +0000)]
Build recovery-two-step.img for two-step OTAs. am:
47ec5ab561
am:
eb9de30596
Change-Id: I5f9b5d5ab4e4b0702dd110b1e70871b8df2db2df
Marco Nelissen [Fri, 2 Dec 2016 16:46:48 +0000 (16:46 +0000)]
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am:
198262ff83 -s ours am:
953a9eb3d3 am:
14d24b3d5f -s ours am:
0d45d96082 am:
6f45a5f721 am:
22b2728055 am:
37d1ec0632 -s ours
am:
f8dc0c9dc5
Change-Id: Id20a467fc9c4883437cdf22779b6d7466f1b1bcb
Marco Nelissen [Fri, 2 Dec 2016 16:46:34 +0000 (16:46 +0000)]
DO NOT MERGE increase generic_mips system partition am:
7824073a36 -s ours am:
0c041e9ada am:
29ee191947 -s ours am:
16ee67f1a7 am:
8fc84f4de0 am:
7474d313f9 am:
ac0ca8f326 -s ours
am:
58c4e2e48a
Change-Id: Iba9549d8886e7b4389dd4b9e7819e0036be27a27
Tao Bao [Fri, 2 Dec 2016 16:46:33 +0000 (16:46 +0000)]
Build recovery-two-step.img for two-step OTAs.
am:
47ec5ab561
Change-Id: I5288993e010fca9abab66a6aece45a48d1844d43
Marco Nelissen [Fri, 2 Dec 2016 16:39:47 +0000 (16:39 +0000)]
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am:
198262ff83 -s ours am:
953a9eb3d3 am:
14d24b3d5f -s ours am:
0d45d96082 am:
6f45a5f721 am:
22b2728055
am:
37d1ec0632 -s ours
Change-Id: I428c6d48643b7237bbbf8104589c210d25eb1055
Marco Nelissen [Fri, 2 Dec 2016 16:39:32 +0000 (16:39 +0000)]
DO NOT MERGE increase generic_mips system partition am:
7824073a36 -s ours am:
0c041e9ada am:
29ee191947 -s ours am:
16ee67f1a7 am:
8fc84f4de0 am:
7474d313f9
am:
ac0ca8f326 -s ours
Change-Id: Ie648485e2ee7e77f4cb3d1908e77869aeb60b1b0
Marco Nelissen [Fri, 2 Dec 2016 16:32:19 +0000 (16:32 +0000)]
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am:
198262ff83 -s ours am:
953a9eb3d3 am:
14d24b3d5f -s ours am:
0d45d96082 am:
6f45a5f721
am:
22b2728055
Change-Id: I6343efb304a4f1fe2bc91991c91fdf654470a5d5
Marco Nelissen [Fri, 2 Dec 2016 16:32:04 +0000 (16:32 +0000)]
DO NOT MERGE increase generic_mips system partition am:
7824073a36 -s ours am:
0c041e9ada am:
29ee191947 -s ours am:
16ee67f1a7 am:
8fc84f4de0
am:
7474d313f9
Change-Id: I46a20b65f19a35f5acded84d69f1357cd2505cb5
Marco Nelissen [Fri, 2 Dec 2016 16:24:48 +0000 (16:24 +0000)]
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am:
198262ff83 -s ours am:
953a9eb3d3 am:
14d24b3d5f -s ours am:
0d45d96082
am:
6f45a5f721
Change-Id: I8dcd653967d64d937c6668f5ac96ea9b1e318e1f
Marco Nelissen [Fri, 2 Dec 2016 16:24:32 +0000 (16:24 +0000)]
DO NOT MERGE increase generic_mips system partition am:
7824073a36 -s ours am:
0c041e9ada am:
29ee191947 -s ours am:
16ee67f1a7
am:
8fc84f4de0
Change-Id: I27c7113fe9835abda40aaccab6d51f77fcfa904f
Marco Nelissen [Fri, 2 Dec 2016 16:17:49 +0000 (16:17 +0000)]
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am:
198262ff83 -s ours am:
953a9eb3d3 am:
14d24b3d5f -s ours
am:
0d45d96082
Change-Id: I2e344c35fe0e9ee0b54db9ba27767e933d9ab4b9
Marco Nelissen [Fri, 2 Dec 2016 16:17:32 +0000 (16:17 +0000)]
DO NOT MERGE increase generic_mips system partition am:
7824073a36 -s ours am:
0c041e9ada am:
29ee191947 -s ours
am:
16ee67f1a7
Change-Id: I0e49eb7e973eed961be9ad4906ab9973f336d53c
Marco Nelissen [Fri, 2 Dec 2016 16:10:18 +0000 (16:10 +0000)]
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am:
198262ff83 -s ours am:
953a9eb3d3
am:
14d24b3d5f -s ours
Change-Id: Ic1a6a4a38bb031d1cafe2a464a7376761905f785
Marco Nelissen [Fri, 2 Dec 2016 16:10:01 +0000 (16:10 +0000)]
DO NOT MERGE increase generic_mips system partition am:
7824073a36 -s ours am:
0c041e9ada
am:
29ee191947 -s ours
Change-Id: If071ac480c61b67b623127d3642948bfcf43a0de
Marco Nelissen [Fri, 2 Dec 2016 16:03:16 +0000 (16:03 +0000)]
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am:
198262ff83 -s ours
am:
953a9eb3d3
Change-Id: If584daaf9b59531ebc9854003164ef6d7834c931
Marco Nelissen [Fri, 2 Dec 2016 16:03:01 +0000 (16:03 +0000)]
DO NOT MERGE increase generic_mips system partition am:
7824073a36 -s ours
am:
0c041e9ada
Change-Id: I2e774bf919520af01ba19f570c5d97bc8d6c85b0
Marco Nelissen [Fri, 2 Dec 2016 15:55:31 +0000 (15:55 +0000)]
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev
am:
198262ff83 -s ours
Change-Id: I0a336fa847df3c1375e1263e50723f08635d531f
Marco Nelissen [Fri, 2 Dec 2016 15:55:30 +0000 (15:55 +0000)]
DO NOT MERGE increase generic_mips system partition
am:
7824073a36 -s ours
Change-Id: I1b60e3cfc39735edfdcc48b215d53e7dac5aa207
Marco Nelissen [Fri, 2 Dec 2016 15:45:17 +0000 (15:45 +0000)]
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev
Tao Bao [Fri, 2 Dec 2016 15:26:29 +0000 (15:26 +0000)]
Merge "Build recovery-two-step.img for two-step OTAs." am:
06e14e438f
am:
d07f9995b8
Change-Id: I256b7c146db3bfc0df4909f643edee1a7c8dd61b
Tao Bao [Fri, 2 Dec 2016 15:19:00 +0000 (15:19 +0000)]
Merge "Build recovery-two-step.img for two-step OTAs."
am:
06e14e438f
Change-Id: I9c5d6e5f71da88bc0f662373335b024a55ca193e
Tao Bao [Fri, 2 Dec 2016 15:09:13 +0000 (15:09 +0000)]
Merge "Build recovery-two-step.img for two-step OTAs."
Yohann Roussel [Fri, 18 Nov 2016 18:30:28 +0000 (19:30 +0100)]
Set platform min sdk for Jack to o-b1
Test: m core-all
(cherry picked from commit
94acfe908b3e70cdd11920c92715ef06de7ed212)
Change-Id: I26a558677f2fa8ede09ad1ae7f31b786c4ba0a43
Tao Bao [Wed, 30 Nov 2016 20:11:57 +0000 (12:11 -0800)]
Build recovery-two-step.img for two-step OTAs.
In two-step OTAs, we write recovery image to /boot as the first step so
that we can reboot from there and install a new recovery image to
/recovery. However, bootloader will show "Your device is corrupt"
message when booting /boot with the recovery image. Because the recovery
image encodes the path of "/recovery" as part of the signature metadata,
which fails the verified boot.
This CL generates a special "recovery-two-step.img" in addition to the
regular recovery.img. This image encodes "/boot" when being signed,
which will be flashed to /boot at stage 1/3 in a two-step OTA.
Here are the desired changes:
- 'IMAGES/recovery-two-step.img' exists in target_files.zip for non-A/B
targets (e.g. bullhead). The image should not exist for targets that
don't have a recovery partition (e.g. A/B devices like sailfish).
- <device>-img.zip should not contain 'recovery-two-step.img'.
- Nothing should change when building non-two-step OTAs. For two-step
OTAs, 'recovery-two-step.img' should be included in the OTA package;
'updater-script' should flash this image to /boot at stage 1/3.
- When building a two-step OTA with an input TF.zip that doesn't have
IMAGES/recovery-two-step.img, it should use the existing
IMAGES/recovery.img instead.
Bug:
32986477
Test: Tested the steps above on bullhead and sailfish.
Change-Id: I34e6c599bcf2011d4cd5c926999418b3975d6d0f
(cherry picked from commit
d42e97ebb45fdc5a30799a3f37e482948d318010)
Tao Bao [Wed, 30 Nov 2016 20:11:57 +0000 (12:11 -0800)]
Build recovery-two-step.img for two-step OTAs.
In two-step OTAs, we write recovery image to /boot as the first step so
that we can reboot from there and install a new recovery image to
/recovery. However, bootloader will show "Your device is corrupt"
message when booting /boot with the recovery image. Because the recovery
image encodes the path of "/recovery" as part of the signature metadata,
which fails the verified boot.
This CL generates a special "recovery-two-step.img" in addition to the
regular recovery.img. This image encodes "/boot" when being signed,
which will be flashed to /boot at stage 1/3 in a two-step OTA.
Here are the desired changes:
- 'IMAGES/recovery-two-step.img' exists in target_files.zip for non-A/B
targets (e.g. bullhead). The image should not exist for targets that
don't have a recovery partition (e.g. A/B devices like sailfish).
- <device>-img.zip should not contain 'recovery-two-step.img'.
- Nothing should change when building non-two-step OTAs. For two-step
OTAs, 'recovery-two-step.img' should be included in the OTA package;
'updater-script' should flash this image to /boot at stage 1/3.
- When building a two-step OTA with an input TF.zip that doesn't have
IMAGES/recovery-two-step.img, it should use the existing
IMAGES/recovery.img instead.
Bug:
32986477
Test: Tested the steps above on bullhead and sailfish.
Change-Id: I34e6c599bcf2011d4cd5c926999418b3975d6d0f
Pirama Arumuga Nainar [Thu, 1 Dec 2016 18:16:13 +0000 (18:16 +0000)]
Merge "Do not *directly* package libbcc.so" am:
ec0d7cbc49
am:
0cc559f7d8
Change-Id: Ida5a4c8d5643bbe1bdd3d1b2f106ce06ba95b334
Pirama Arumuga Nainar [Thu, 1 Dec 2016 18:11:13 +0000 (18:11 +0000)]
Merge "Do not *directly* package libbcc.so"
am:
ec0d7cbc49
Change-Id: I15871b1ca4cb5fa5488721a5f6a21bfa2a72feab
Pirama Arumuga Nainar [Thu, 1 Dec 2016 17:58:46 +0000 (17:58 +0000)]
Merge "Do not *directly* package libbcc.so"
Tao Bao [Thu, 1 Dec 2016 17:13:37 +0000 (17:13 +0000)]
Merge "releasetools: Remove dead parameter in GetBootableImage()." am:
8df4fea85f
am:
2e3f1c5258
Change-Id: I49a84adeac56d399749920272f07d3eacc436be4
Tao Bao [Thu, 1 Dec 2016 17:09:07 +0000 (17:09 +0000)]
Merge "releasetools: Remove dead parameter in GetBootableImage()."
am:
8df4fea85f
Change-Id: I192af3927849d0d8f995f0002b8b8f2e191b794f
Tao Bao [Thu, 1 Dec 2016 17:02:06 +0000 (17:02 +0000)]
Merge "releasetools: Remove dead parameter in GetBootableImage()."
OSDN Git Service
