OSDN Git Service
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
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
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."
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()."
Paul Duffin [Thu, 1 Dec 2016 10:48:46 +0000 (10:48 +0000)]
Merge "Replace core-junit with legacy-test" am:
32cc1f80e5
am:
74f8ee05de
Change-Id: Id32488dfe7498c7b00ba05c2fa88de6465b362ee
Paul Duffin [Thu, 1 Dec 2016 10:42:16 +0000 (10:42 +0000)]
Merge "Replace core-junit with legacy-test"
am:
32cc1f80e5
Change-Id: Id425eff2aaafdf8ad63bc66ef2d28f71d32d6e8b
Paul Duffin [Thu, 1 Dec 2016 10:34:07 +0000 (10:34 +0000)]
Merge "Replace core-junit with legacy-test"
Tao Bao [Thu, 1 Dec 2016 08:08:05 +0000 (00:08 -0800)]
releasetools: Remove dead parameter in GetBootableImage().
The 'system_img_path' parameter was introduced in commit
d995f4b04df46d9e9ac1be8d58ca961e94b783d1, but became obsolete since
commit
2ce63edab715ae4ff34e1a2ef240b05216f6ca5d.
Test: m dist
Change-Id: Iffd496d929db5cc3dfc955a48bfc1b1317bd012f
Andreas Gampe [Thu, 1 Dec 2016 02:58:05 +0000 (02:58 +0000)]
Merge changes from topic 'simplify_app_process_asan_modules' am:
9a3bd76ab4
am:
d3708a5aeb
Change-Id: Ieda8df429285548676089a7653e97ea36b542526
Andreas Gampe [Thu, 1 Dec 2016 02:57:59 +0000 (02:57 +0000)]
Revert "Build: Add sanitized app_process" am:
88d43677f5
am:
d77b29fdb3
Change-Id: Ie46ff2d5b15970ee188ad8e0ac64278a0ce4e4cf
Andreas Gampe [Thu, 1 Dec 2016 02:57:54 +0000 (02:57 +0000)]
Revert "Build: Add asanwrapper in SANITIZE_LITE" am:
4938f3300a
am:
92058120b2
Change-Id: I818d10ecaee2be176abecbb70d3d0997ea86d6bc
Andreas Gampe [Thu, 1 Dec 2016 02:48:21 +0000 (02:48 +0000)]
Merge changes from topic 'simplify_app_process_asan_modules'
am:
9a3bd76ab4
Change-Id: I07d79da80ce2fce035c87e768d12c1b136bf6fdd
Andreas Gampe [Thu, 1 Dec 2016 02:47:34 +0000 (02:47 +0000)]
Revert "Build: Add sanitized app_process"
am:
88d43677f5
Change-Id: I358a67f5e89bf72e7bba9d97a16d34d9a3e79afb
Andreas Gampe [Thu, 1 Dec 2016 02:47:29 +0000 (02:47 +0000)]
Revert "Build: Add asanwrapper in SANITIZE_LITE"
am:
4938f3300a
Change-Id: Ic3745664db0b89baaea8b98b79ead63a77e95440
Treehugger Robot [Thu, 1 Dec 2016 02:38:29 +0000 (02:38 +0000)]
Merge changes from topic 'simplify_app_process_asan_modules'
* changes:
Revert "Build: Add sanitized app_process"
Revert "Build: Add asanwrapper in SANITIZE_LITE"
Andreas Gampe [Wed, 30 Nov 2016 23:38:43 +0000 (15:38 -0800)]
Revert "Build: Add sanitized app_process"
This reverts commit
a35d92e4312b2247b0a27e17a6f08f82dae49fdf.
The app_process__asan module is merged into app_process.
Bug:
33224213
Test: m
Change-Id: I5e3e836c67b5bd17cf967f1b2429e39c4e18557b
Andreas Gampe [Wed, 30 Nov 2016 23:38:31 +0000 (15:38 -0800)]
Revert "Build: Add asanwrapper in SANITIZE_LITE"
This reverts commit
eee31511f70398ada44c7f8811234311ce8c7a7f.
Rewriting of app_process adds an automatic dependency.
Bug:
33224213
Test: m
Change-Id: Idd9509d116692954224f4d2ffd6c81b69e9a85a3
Andreas Gampe [Thu, 1 Dec 2016 00:17:02 +0000 (00:17 +0000)]
Merge changes from topic 'app_process_sanitized_binaries' am:
de24e6198e
am:
88757661d5
Change-Id: I9567415f53bb86e6d2caebe51060c66e9400cead
Andreas Gampe [Thu, 1 Dec 2016 00:16:55 +0000 (00:16 +0000)]
Build: Add asanwrapper in SANITIZE_LITE am:
eee31511f7
am:
3c326183ca
Change-Id: I14fe1837e7cc66e9c6f124353c860959b230b779
Andreas Gampe [Thu, 1 Dec 2016 00:16:49 +0000 (00:16 +0000)]
Build: Add sanitized app_process am:
a35d92e431
am:
2ceff14391
Change-Id: I55ecc896ca76a74baad033dd9b48462fc00c3235
Andreas Gampe [Thu, 1 Dec 2016 00:09:03 +0000 (00:09 +0000)]
Merge changes from topic 'app_process_sanitized_binaries'
am:
de24e6198e
Change-Id: Ie077774c7816e7bf19c4474e9fa36824e10d58d4
Andreas Gampe [Thu, 1 Dec 2016 00:06:26 +0000 (00:06 +0000)]
Build: Add asanwrapper in SANITIZE_LITE
am:
eee31511f7
Change-Id: I2fda3c98543296418b7c4741e8425f1ab35f7fb1
Andreas Gampe [Thu, 1 Dec 2016 00:06:20 +0000 (00:06 +0000)]
Build: Add sanitized app_process
am:
a35d92e431
Change-Id: Idc10fa334820dab5de1a697092e4c14fb6023425
Pirama Arumuga Nainar [Wed, 30 Nov 2016 23:40:43 +0000 (15:40 -0800)]
Do not *directly* package libbcc.so
Bug: http://b/
28866258
Remove libbcc.so from the list of directly packaged modules. 64-bit
libbcc.so gets included as a dependency for the bcc executable (which is
a required package). 32-bit libbcc.so is no longer necessary on 64-bit
devices.
This change also removes 32-bit libLLVM.so from a 64-bit system image
(leading to a 13M reduction in Angler's system image on AOSP) and a
considerable reduction in build time.
Test: - Build all topics in this CL
- RsTest (including the 32-bit ABI) and CTS tests pass on x86 and
x86_64 emulators and Angler.
Change-Id: I10f07e322a615f37d6967b7c938635f544ddceff
Treehugger Robot [Wed, 30 Nov 2016 21:00:55 +0000 (21:00 +0000)]
Merge changes from topic 'app_process_sanitized_binaries'
* changes:
Build: Add asanwrapper in SANITIZE_LITE
Build: Add sanitized app_process
Andreas Gampe [Wed, 30 Nov 2016 18:20:20 +0000 (10:20 -0800)]
Build: Add asanwrapper in SANITIZE_LITE
Add asanwrapper helper binary to PRODUCT_PACKAGES when building with
SANITIZE_LITE=true.
Bug:
33224213
Test: m SANITIZE_TARGET=address SANITIZE_LITE=true && ls $OUT/system/bin/asanwrapper
Change-Id: Ic4d8973b9e9ddfd9ef8663735bf5f70d8f9f70e1
Paul Duffin [Tue, 29 Nov 2016 12:15:13 +0000 (12:15 +0000)]
Replace core-junit with legacy-test
m -j32 checkbuild cts droid
adb reboot bootloader
fastboot flashall -w
cts-tradefed run cts -m CtsLibcoreTestCases
Bug:
30188076
Test: As above
Change-Id: I2d49cb3c451cb265d026f9a700a61b3fc0d2ed82
Andreas Gampe [Wed, 30 Nov 2016 03:22:01 +0000 (19:22 -0800)]
Build: Add sanitized app_process
Add sanitized app_process module to PRODUCT_PACKAGES when building
with SANITIZE_LITE=true
Bug:
33224213
Test: m SANITIZE_TARGET=address SANITIZE_LITE=true && ls $OUT/system/bin/asan
Change-Id: Ic67976f1b897b638d569ec6f42d5a8d59f8a9285
Andreas Gampe [Wed, 30 Nov 2016 00:53:09 +0000 (00:53 +0000)]
Merge "Revert "Build: Bring back SDK dependencies"" am:
2bbeae7f8a
am:
f606cc1677
Change-Id: I98a2c0a30012b1649d21a780f9eb22d30bcb0655
Andreas Gampe [Wed, 30 Nov 2016 00:48:39 +0000 (00:48 +0000)]
Merge "Revert "Build: Bring back SDK dependencies""
am:
2bbeae7f8a
Change-Id: I9560d6a8f9971db89c87499b2e177bd0bb921cff
Treehugger Robot [Wed, 30 Nov 2016 00:39:33 +0000 (00:39 +0000)]
Merge "Revert "Build: Bring back SDK dependencies""
Dan Willemsen [Tue, 29 Nov 2016 20:47:46 +0000 (20:47 +0000)]
Merge changes from topic 'basic_vndk' am:
e69f15c9dc
am:
474bba8831
Change-Id: I20781d5c2dabfd17f1bdff90c05181e226212b16
Dan Willemsen [Tue, 29 Nov 2016 20:47:40 +0000 (20:47 +0000)]
Prohibit host modules from using LOCAL_COPY_HEADERS am:
6e51ef61a7
am:
dc556b4bc0
Change-Id: I332c1128472baef57367bbf7be25ed0338a8f4d2
Dan Willemsen [Tue, 29 Nov 2016 20:47:33 +0000 (20:47 +0000)]
Add basic VNDK support in Make am:
bab0fa6928
am:
323efd3035
Change-Id: I6a3f89a810782b965152a415947da26b930fc408
Dan Willemsen [Tue, 29 Nov 2016 20:47:27 +0000 (20:47 +0000)]
Remove GLOBAL_LD_DIRS am:
e5836c4bb0
am:
28cf7d49ab
Change-Id: I35109a1e1ec6fb546da0e4cf439e670d4f8c8cd0
Dan Willemsen [Tue, 29 Nov 2016 20:42:40 +0000 (20:42 +0000)]
Merge changes from topic 'basic_vndk'
am:
e69f15c9dc
Change-Id: Idf95a23c4b1341145f9e39364235413c82f659ac
Dan Willemsen [Tue, 29 Nov 2016 20:42:37 +0000 (20:42 +0000)]
Prohibit host modules from using LOCAL_COPY_HEADERS
am:
6e51ef61a7
Change-Id: Id7c80e4dba5a505a04ce47d459c0a525debc4d53
Dan Willemsen [Tue, 29 Nov 2016 20:42:32 +0000 (20:42 +0000)]
Add basic VNDK support in Make
am:
bab0fa6928
Change-Id: Ie2bc9062891b2f8000b1db471b27f58c74190e92
Dan Willemsen [Tue, 29 Nov 2016 20:42:26 +0000 (20:42 +0000)]
Remove GLOBAL_LD_DIRS
am:
e5836c4bb0
Change-Id: I6683ed19bff601075e82065c5c1dc783d62249b4
Treehugger Robot [Tue, 29 Nov 2016 20:36:04 +0000 (20:36 +0000)]
Merge changes from topic 'basic_vndk'
* changes:
Prohibit host modules from using LOCAL_COPY_HEADERS
Add basic VNDK support in Make
Remove GLOBAL_LD_DIRS
Tao Bao [Tue, 29 Nov 2016 00:28:07 +0000 (00:28 +0000)]
Makefile: Pack verity_verifier into otatools.zip. am:
7bb3aff71c am:
ad8924117d am:
7981d953a9
am:
41fd473e45
Change-Id: I096bab71bc1bdf3cfd9e8ede276504b65313af9c
Tao Bao [Tue, 29 Nov 2016 00:24:05 +0000 (00:24 +0000)]
Makefile: Pack verity_verifier into otatools.zip. am:
7bb3aff71c am:
ad8924117d
am:
7981d953a9
Change-Id: I8ccc7c02e2c577293b7bfc29759b79f1908863d8
Tao Bao [Tue, 29 Nov 2016 00:19:36 +0000 (00:19 +0000)]
Makefile: Pack verity_verifier into otatools.zip. am:
7bb3aff71c
am:
ad8924117d
Change-Id: Ia766ef6038434d8435a81f7e921de2936fd33411
Tao Bao [Tue, 29 Nov 2016 00:15:05 +0000 (00:15 +0000)]
Makefile: Pack verity_verifier into otatools.zip.
am:
7bb3aff71c
Change-Id: Iffb447dea7f4b227edf5311229ea0902bb4b25f5
Zheng Zhang [Tue, 29 Nov 2016 00:05:56 +0000 (00:05 +0000)]
Merge "DO NOT MERGE: build_image: add padding to match partition size" into cw-f-dev
am:
28b96d1470
Change-Id: I15652b49a63793ca7a6783d92a069114a31da672
Sami Tolvanen [Tue, 29 Nov 2016 00:05:40 +0000 (00:05 +0000)]
DO NOT MERGE: build_image: add padding to match partition size
am:
9a675c94d3 -s ours
Change-Id: If0f79158a14fb0ee565990fa32cf899ec346b12f
Adam Seaton [Mon, 28 Nov 2016 22:19:24 +0000 (22:19 +0000)]
Merge changes I30f397b0,I717a6f03 into lmp-dev am:
1a242b67fe am:
27ac4ac1da am:
ac64c64f9a am:
618f64d183 am:
d635edfd04 am:
6f0c3f4bdc am:
c5ecbe4047 am:
4a45d769e9 am:
e033ae9cff am:
8185ca3cd3
am:
777b8bb190
Change-Id: I44b2a75e03bf46c5426cf4da1c4ea09f3717b487
Adam Seaton [Mon, 28 Nov 2016 22:19:15 +0000 (22:19 +0000)]
Updating Security String to 2017-01-05 am:
26250019df am:
6a9981128d am:
1691e69497 -s ours am:
4d3fa3f47e am:
26f54a9c9d am:
1685901f54 am:
de90bd9c11 am:
373d596d29 am:
d4318b4dd8 am:
6b712cfc00
am:
f374f992fa
Change-Id: I5e59a22b40f793afab182894c9bc4df40c96dd43
Adam Seaton [Mon, 28 Nov 2016 22:19:05 +0000 (22:19 +0000)]
Updating Security String to 2017-01-01 am:
a0985a838b am:
542e90b0be am:
99abf297d8 -s ours am:
8316b162d9 am:
3d6c04a185 am:
954e945541 am:
00e57d1e7d am:
69324d3272 am:
aca891ceb7 am:
c7c9e9e6ae
am:
da23655530
Change-Id: I544e10e76fa66a1ef42c366eb79933ac21f314fc
Adam Seaton [Mon, 28 Nov 2016 22:18:40 +0000 (22:18 +0000)]
Update Security String to 2017-01-05 in klp-dev am:
4f483f18e7 am:
b2cc64fdd5 am:
3fa1b8a55e -s ours am:
7fa6402d8e am:
70849c073b am:
85e8b1c54f am:
a0e047834c am:
e515169acc am:
925cdbcc44 am:
3b6d4247d4 am:
fc9a3a6289 am:
e6228c3c29 am:
26cd57c3dd
am:
973cf83398
Change-Id: I02df1a95bdf119011de936a7ddfccee79de91c10
Adam Seaton [Mon, 28 Nov 2016 22:18:29 +0000 (22:18 +0000)]
Update Security string to 2017-01-01 in klp-dev am:
21f5d281f3 am:
0f344dd00a am:
a50e96923c -s ours am:
6a89a1936f am:
2652d28bea am:
a8cedadbf9 am:
f1372e43e5 am:
27202c78b9 am:
0ab37afc51 am:
23654fcee6 am:
49ab1b9aec am:
4066fd01b1 am:
c9372a0cf7
am:
8755a73c93
Change-Id: Ie472dfdae1fac4a5c7112141f63030cd4b6ae00c
Adam Seaton [Mon, 28 Nov 2016 22:18:01 +0000 (22:18 +0000)]
Updating Security String to 2017-01-05 on mnc-dev am:
5e46dc2215 am:
f57eb8ce2d am:
b81dff49dc am:
b25cb027ea -s ours am:
d74f26b3bf am:
54bfae5f11 am:
23ecbbbe31
am:
01ccb41c44
Change-Id: I70566cb5f2933dd2d59bfcee050fec81f40d7f1b
Adam Seaton [Mon, 28 Nov 2016 22:17:50 +0000 (22:17 +0000)]
Updating Security string to 2017-01-01 on mnc-dev am:
7224901e6b am:
5b54c86fb7 am:
0ca9715ced am:
1512b79479 -s ours am:
6eb9073057 am:
25d73fa79b am:
989a7633f7
am:
813ec07751
Change-Id: I11be60d37a54f481c97b9cadbbc092226d662bfc
Adam Seaton [Mon, 28 Nov 2016 22:17:27 +0000 (22:17 +0000)]
Updating Security String to 2017-01-05 on nyc-dev am:
190129bc61 am:
b9085822a5 am:
091dea5c83
am:
223b79e356
Change-Id: I2348ef3b34370e4bbc5634a17565cfc2d54b0217
Adam Seaton [Mon, 28 Nov 2016 22:17:21 +0000 (22:17 +0000)]
Updating Security String to 2017-01-01 on nyc-dev am:
202380f93e am:
6108f21d36 am:
6a954bbdbc
am:
2e5e286112
Change-Id: I25ce54c3b60632005f4c5d6a76241f9a996d9961
Tao Bao [Mon, 28 Nov 2016 22:17:06 +0000 (22:17 +0000)]
releasetools: Use java_path in sign_target_files_apks.py. am:
cd4f7c96c0 am:
6414a94c50 am:
4722fc1734
am:
e6a27e7e69
Change-Id: I091d4adc8e6d153ed77b41a27b90b2642c8d0f72
Alexander Levitskiy [Mon, 28 Nov 2016 22:16:44 +0000 (22:16 +0000)]
Merge "build: tools: Add json collection of installed files with hashes." into cw-f-dev
am:
343d72fac8 -s ours
Change-Id: Ie5dd7f5e7cc3cabb9688dbc0d5ca602b7d85feec
Sasha Levitskiy [Mon, 28 Nov 2016 22:16:42 +0000 (22:16 +0000)]
build: tools: Add json collection of installed files with hashes.
am:
3c97fa78cd -s ours
Change-Id: Ida939796284dc13f5e06ac8541253ab453c4ec2d
Tao Bao [Mon, 28 Nov 2016 22:16:08 +0000 (22:16 +0000)]
releasetools: Support verity signer args. am:
c7814837a0 am:
8a6d94c9aa am:
b31f486d75
am:
53a1acf53b
Change-Id: If1943ed19ad26d00be65ba864b0372aafaaca2a7
Dan Willemsen [Wed, 23 Nov 2016 00:17:38 +0000 (16:17 -0800)]
Prohibit host modules from using LOCAL_COPY_HEADERS
There are no users left, so remove all of this.
Test: lunch aosp_arm-eng; m -j native
Test: build/tools/kati_all_products.sh on aosp and internal master
Change-Id: I32f5c8b470a43dd203d7e20c192167630e4e6888
Dan Willemsen [Fri, 18 Nov 2016 22:05:39 +0000 (14:05 -0800)]
Add basic VNDK support in Make
Add BOARD_VNDK_VERSION and LOCAL_USE_VNDK to specify the version of the
VNDK that will be used globally, and whether to use the VNDK on a module
basis.
If the board is using the VNDK:
* LOCAL_COPY_HEADERS may only be used by modules defining LOCAL_USE_VNDK
* LOCAL_USE_VNDK modules will compile against the NDK headers and stub
libraries, but continue to use the platform libc++.
* LOCAL_USE_VNDK modules will not have the global includes like
system/core/include, but it will use device-specific kernel headers.
This change does not attempt to enforce any linking constraints, that
will come in a later patch.
Test: out/build-aosp_arm.ninja is identical before/after
Change-Id: Icce65d4974f085093d500b5b2516983788fe2905
Dan Willemsen [Tue, 22 Nov 2016 23:13:56 +0000 (15:13 -0800)]
Remove GLOBAL_LD_DIRS
The last user of this was the NDK, which has been using full paths in
binary.mk. So remove it.
Test: lunch aosp_arm-eng; m -j native
Change-Id: Ida2523a2d19131ee3ef005edb3e5bcf830710b11
Tao Bao [Mon, 28 Nov 2016 18:17:57 +0000 (18:17 +0000)]
Merge "Makefile: Pack verity_verifier into otatools.zip." am:
31543713fc
am:
5cd53f7e22
Change-Id: Iddf347069d59f2e6e90e509e1768f5fffbff1cf3
Tao Bao [Mon, 28 Nov 2016 18:17:42 +0000 (18:17 +0000)]
Makefile: Pack verity_verifier into otatools.zip. am:
7f02f3413b
am:
3b35352e1b
Change-Id: Ia25e3e004abce18bbd05001b783a2eeda1717e20
Tao Bao [Mon, 28 Nov 2016 18:13:45 +0000 (18:13 +0000)]
Merge "Makefile: Pack verity_verifier into otatools.zip."
am:
31543713fc
Change-Id: I94587dc4f80edd61d5d414742513c4360609259f
Tao Bao [Mon, 28 Nov 2016 18:13:43 +0000 (18:13 +0000)]
Makefile: Pack verity_verifier into otatools.zip.
am:
7f02f3413b
Change-Id: Ib9c73dd16016b582dbaf2c40ebfc9b20c1adabe3
Tao Bao [Sat, 19 Nov 2016 01:04:24 +0000 (17:04 -0800)]
Makefile: Pack verity_verifier into otatools.zip.
verity_verifier is needed when verifying verity metadata.
Bug:
32173582
Test: `m otatools-package`
Change-Id: I63fdeb75cdca10ea38c1df978d64701acdd4c1db
(cherry picked from commit
7f02f3413b8cd2e6b5cfda3883b2783ab819558b)
Tao Bao [Mon, 28 Nov 2016 18:04:04 +0000 (18:04 +0000)]
Merge "Makefile: Pack verity_verifier into otatools.zip."
Tao Bao [Sat, 19 Nov 2016 01:04:24 +0000 (17:04 -0800)]
Makefile: Pack verity_verifier into otatools.zip.
verity_verifier is needed when verifying verity metadata.
Bug:
32173582
Test: `m otatools-package`
Change-Id: I63fdeb75cdca10ea38c1df978d64701acdd4c1db
Ian Rogers [Tue, 22 Nov 2016 18:53:21 +0000 (18:53 +0000)]
Merge "Update warn.py for new Error Prone diagnostics" am:
7ed3af23a8
am:
1eef968704
Change-Id: I853848314ffce962a8b0c5dcf5cfc99343461e88
Ian Rogers [Tue, 22 Nov 2016 18:50:21 +0000 (18:50 +0000)]
Merge "Update warn.py for new Error Prone diagnostics"
am:
7ed3af23a8
Change-Id: Iae1dec6c0b48be23d874c01b9d87627bbf0c0caf
Ian Rogers [Tue, 22 Nov 2016 18:43:50 +0000 (18:43 +0000)]
Merge "Update warn.py for new Error Prone diagnostics"
Nick Glorioso [Tue, 15 Nov 2016 23:57:57 +0000 (15:57 -0800)]
Update warn.py for new Error Prone diagnostics
Test: Local build, tee'd to file, ran warn.py and checked output HTML
Change-Id: Iee3386e88c73e4b8e0a1fcc60105ee5fb86e3cb0
Zheng Zhang [Sun, 20 Nov 2016 06:22:16 +0000 (06:22 +0000)]
Merge "DO NOT MERGE: build_image: add padding to match partition size" into cw-f-dev
Dan Albert [Fri, 18 Nov 2016 19:12:37 +0000 (19:12 +0000)]
Merge "Support `LOCAL_SDK_VERSION := current` for NDK." am:
c7d2fe614e
am:
6cac9ba834
Change-Id: If64f88bee6162adada642ddedcf84747443068cc
Dan Albert [Fri, 18 Nov 2016 19:09:36 +0000 (19:09 +0000)]
Merge "Support `LOCAL_SDK_VERSION := current` for NDK."
am:
c7d2fe614e
Change-Id: Ibf9a4ffa74f5d05f68bd34db908fe4e5a67fe173
Treehugger Robot [Fri, 18 Nov 2016 19:04:39 +0000 (19:04 +0000)]
Merge "Support `LOCAL_SDK_VERSION := current` for NDK."
Andreas Gampe [Fri, 18 Nov 2016 03:42:51 +0000 (19:42 -0800)]
Revert "Build: Bring back SDK dependencies"
This reverts commit
ff00c5d78faeacfaae1abc69d69d7cd8c0e9d3ff.
Test: m
Andreas Gampe [Fri, 18 Nov 2016 02:59:28 +0000 (02:59 +0000)]
Merge "Build: Bring back SDK dependencies" am:
eb06c77b80
am:
2a2442c6f2
Change-Id: I6f3331782124fe9447b6fc2eda1727a2bb645be7
Andreas Gampe [Fri, 18 Nov 2016 02:57:28 +0000 (02:57 +0000)]
Merge "Build: Bring back SDK dependencies"
am:
eb06c77b80
Change-Id: I0c15adcd387980b94c5544427d4f4fdad3f7ff31
Andreas Gampe [Fri, 18 Nov 2016 02:53:28 +0000 (02:53 +0000)]
Merge "Build: Bring back SDK dependencies"
Andreas Gampe [Fri, 18 Nov 2016 02:21:36 +0000 (18:21 -0800)]
Build: Bring back SDK dependencies
Temporarily re-add SDK dependencies to runtime_libart.mk.
Test: m sdk_repo
Change-Id: I5c2054d7be6ea1c5e6eadbcb3453cabfc64728d6
Andreas Gampe [Fri, 18 Nov 2016 01:34:20 +0000 (01:34 +0000)]
Merge "Build: Refactor and clean up runtime_libart" am:
020f5275d5
am:
bd7d5aea2a
Change-Id: I203c3da1abfc17a22eaedf719dd13a2b083a8680
Andreas Gampe [Fri, 18 Nov 2016 01:32:20 +0000 (01:32 +0000)]
Merge "Build: Refactor and clean up runtime_libart"
am:
020f5275d5
Change-Id: Ifff0829fe3b7e306527e3654ee3833a1935c1ac3
Treehugger Robot [Fri, 18 Nov 2016 01:25:53 +0000 (01:25 +0000)]
Merge "Build: Refactor and clean up runtime_libart"
William Roberts [Fri, 18 Nov 2016 01:12:16 +0000 (01:12 +0000)]
Merge "fs_config: move sort to be consistent with other sort" am:
052a01958c
am:
c06559eb7b
Change-Id: I2acabfd1f5912da126dbc31559e3b458810e75d0
William Roberts [Fri, 18 Nov 2016 00:57:15 +0000 (00:57 +0000)]
Merge "fs_config: move sort to be consistent with other sort"
am:
052a01958c
Change-Id: If18ab459d74e20f96db56d80ecdbf94580583463
Treehugger Robot [Fri, 18 Nov 2016 00:29:52 +0000 (00:29 +0000)]
Merge "fs_config: move sort to be consistent with other sort"
William Roberts [Thu, 17 Nov 2016 23:58:16 +0000 (23:58 +0000)]
Merge "fs_config: correct README" am:
4baaf905ee
am:
2088e57ed8
Change-Id: Ieb523540e0f7ec0e79f52e434d4914e4c1ba47c5
Andreas Gampe [Thu, 17 Nov 2016 23:58:02 +0000 (23:58 +0000)]
Merge "Build: Add agent library to default packages" am:
709aaa5aea
am:
349b67c6ba
Change-Id: I5c0155b04ef5846b5cc53fb9933bd2998d14b2ae
William Roberts [Thu, 17 Nov 2016 23:42:52 +0000 (23:42 +0000)]
Merge "fs_config: correct README"
am:
4baaf905ee
Change-Id: I1a3fa8a296608205a29efb94c32fbfd14d4844f2
OSDN Git Service
