Zheng Zhang
c898fcdef0
Merge "DO NOT MERGE: build_image: add padding to match partition size" into cw-f-dev
...
am: 28b96d1470
2016-11-29 00:05:56 +00:00
Sami Tolvanen
0badc6ba69
DO NOT MERGE: build_image: add padding to match partition size
...
am: 9a675c94d3
2016-11-29 00:05:40 +00:00
Adam Seaton
5badc58c54
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 am: 5eef4cc855
...
am: a18c5b3374
2016-11-28 22:39:11 +00:00
Adam Seaton
4dd23fa52a
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 am: 282cc6fe0f
...
am: 88b4ff4b44
2016-11-28 22:39:03 +00:00
Adam Seaton
78ad8515ff
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 am: 6d4c579d2b
...
am: 46c0b085e3
2016-11-28 22:38:54 +00:00
Adam Seaton
e60ddbdf68
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 am: df382f1185
...
am: 82653e3053
2016-11-28 22:38:29 +00:00
Adam Seaton
1e76908802
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 am: a182ec2750
...
am: f2519b5887
2016-11-28 22:38:14 +00:00
Adam Seaton
e39f7a0bfd
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 am: 96700aebc9
...
am: 36a656b141
2016-11-28 22:37:51 +00:00
Adam Seaton
55595348a4
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 am: 2574815b8f
...
am: a491358458
2016-11-28 22:37:44 +00:00
Adam Seaton
b0922e04ac
Updating Security String to 2017-01-05 on nyc-dev am: 190129bc61 am: b9085822a5 am: 091dea5c83 am: 223b79e356 am: 63c8e1ea9d
...
am: 992ade125d
2016-11-28 22:37:21 +00:00
Adam Seaton
2e8c48a56f
Updating Security String to 2017-01-01 on nyc-dev am: 202380f93e am: 6108f21d36 am: 6a954bbdbc am: 2e5e286112 am: 0d0a1221d0
...
am: 803a76fa6e
2016-11-28 22:37:14 +00:00
Tao Bao
7359cb3278
releasetools: Use java_path in sign_target_files_apks.py. am: cd4f7c96c0 am: 6414a94c50 am: 4722fc1734 am: e6a27e7e69 am: da41e1d30c
...
am: 1c5bc86930
2016-11-28 22:37:00 +00:00
Alexander Levitskiy
3056198763
Merge "build: tools: Add json collection of installed files with hashes." into cw-f-dev am: 343d72fac8 -s ours am: a814c15a86 -s ours
...
am: 3b5db32af8
2016-11-28 22:36:46 +00:00
Sasha Levitskiy
e9a32c95e5
build: tools: Add json collection of installed files with hashes. am: 3c97fa78cd -s ours am: 121f83aa77 -s ours
...
am: 9c0bd7fc86
2016-11-28 22:36:31 +00:00
Tao Bao
d41383c797
releasetools: Support verity signer args. am: c7814837a0 am: 8a6d94c9aa am: b31f486d75 am: 53a1acf53b am: 80955ccc97
...
am: 45b746ea8d
2016-11-28 22:36:01 +00:00
Adam Seaton
a18c5b3374
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
...
am: 5eef4cc855
2016-11-28 22:27:47 +00:00
Adam Seaton
88b4ff4b44
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
...
am: 282cc6fe0f
2016-11-28 22:27:40 +00:00
Adam Seaton
46c0b085e3
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
...
am: 6d4c579d2b
2016-11-28 22:27:32 +00:00
Adam Seaton
82653e3053
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
...
am: df382f1185
2016-11-28 22:27:08 +00:00
Adam Seaton
f2519b5887
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
...
am: a182ec2750
2016-11-28 22:26:55 +00:00
Adam Seaton
36a656b141
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
...
am: 96700aebc9
2016-11-28 22:26:31 +00:00
Adam Seaton
a491358458
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
...
am: 2574815b8f
2016-11-28 22:26:19 +00:00
Adam Seaton
992ade125d
Updating Security String to 2017-01-05 on nyc-dev am: 190129bc61 am: b9085822a5 am: 091dea5c83 am: 223b79e356
...
am: 63c8e1ea9d
2016-11-28 22:25:54 +00:00
Adam Seaton
803a76fa6e
Updating Security String to 2017-01-01 on nyc-dev am: 202380f93e am: 6108f21d36 am: 6a954bbdbc am: 2e5e286112
...
am: 0d0a1221d0
2016-11-28 22:25:48 +00:00
Tao Bao
1c5bc86930
releasetools: Use java_path in sign_target_files_apks.py. am: cd4f7c96c0 am: 6414a94c50 am: 4722fc1734 am: e6a27e7e69
...
am: da41e1d30c
2016-11-28 22:25:34 +00:00
Alexander Levitskiy
3b5db32af8
Merge "build: tools: Add json collection of installed files with hashes." into cw-f-dev am: 343d72fac8 -s ours
...
am: a814c15a86
2016-11-28 22:25:19 +00:00
Sasha Levitskiy
9c0bd7fc86
build: tools: Add json collection of installed files with hashes. am: 3c97fa78cd -s ours
...
am: 121f83aa77
2016-11-28 22:25:05 +00:00
Tao Bao
45b746ea8d
releasetools: Support verity signer args. am: c7814837a0 am: 8a6d94c9aa am: b31f486d75 am: 53a1acf53b
...
am: 80955ccc97
2016-11-28 22:24:36 +00:00
Adam Seaton
5eef4cc855
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
2016-11-28 22:19:24 +00:00
Adam Seaton
282cc6fe0f
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
2016-11-28 22:19:15 +00:00
Adam Seaton
6d4c579d2b
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
2016-11-28 22:19:05 +00:00
Adam Seaton
df382f1185
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
2016-11-28 22:18:40 +00:00
Adam Seaton
a182ec2750
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
2016-11-28 22:18:29 +00:00
Adam Seaton
96700aebc9
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
2016-11-28 22:18:01 +00:00
Adam Seaton
2574815b8f
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
2016-11-28 22:17:50 +00:00
Adam Seaton
63c8e1ea9d
Updating Security String to 2017-01-05 on nyc-dev am: 190129bc61 am: b9085822a5 am: 091dea5c83
...
am: 223b79e356
2016-11-28 22:17:27 +00:00
Adam Seaton
0d0a1221d0
Updating Security String to 2017-01-01 on nyc-dev am: 202380f93e am: 6108f21d36 am: 6a954bbdbc
...
am: 2e5e286112
2016-11-28 22:17:21 +00:00
Tao Bao
da41e1d30c
releasetools: Use java_path in sign_target_files_apks.py. am: cd4f7c96c0 am: 6414a94c50 am: 4722fc1734
...
am: e6a27e7e69
2016-11-28 22:17:06 +00:00
Alexander Levitskiy
a814c15a86
Merge "build: tools: Add json collection of installed files with hashes." into cw-f-dev
...
am: 343d72fac8
2016-11-28 22:16:44 +00:00
Sasha Levitskiy
121f83aa77
build: tools: Add json collection of installed files with hashes.
...
am: 3c97fa78cd
2016-11-28 22:16:42 +00:00
Tao Bao
80955ccc97
releasetools: Support verity signer args. am: c7814837a0 am: 8a6d94c9aa am: b31f486d75
...
am: 53a1acf53b
2016-11-28 22:16:08 +00:00
Dan Willemsen
6e51ef61a7
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
2016-11-28 13:46:17 -08:00
Dan Willemsen
bab0fa6928
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
2016-11-28 13:46:17 -08:00
Dan Willemsen
e5836c4bb0
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
2016-11-28 13:46:17 -08:00
Tao Bao
cef7668d40
Merge "Makefile: Pack verity_verifier into otatools.zip." am: 31543713fc am: 5cd53f7e22 am: 7442e47c84
...
am: 1d4622c288
2016-11-28 18:26:30 +00:00
Tao Bao
cc6294669b
Makefile: Pack verity_verifier into otatools.zip. am: 7f02f3413b am: 3b35352e1b am: 24ed10c0cb
...
am: 34c5e69b27
2016-11-28 18:26:14 +00:00
Tao Bao
1d4622c288
Merge "Makefile: Pack verity_verifier into otatools.zip." am: 31543713fc am: 5cd53f7e22
...
am: 7442e47c84
2016-11-28 18:22:28 +00:00
Tao Bao
34c5e69b27
Makefile: Pack verity_verifier into otatools.zip. am: 7f02f3413b am: 3b35352e1b
...
am: 24ed10c0cb
2016-11-28 18:22:14 +00:00
Tao Bao
7442e47c84
Merge "Makefile: Pack verity_verifier into otatools.zip." am: 31543713fc
...
am: 5cd53f7e22
2016-11-28 18:17:57 +00:00
Tao Bao
24ed10c0cb
Makefile: Pack verity_verifier into otatools.zip. am: 7f02f3413b
...
am: 3b35352e1b
2016-11-28 18:17:42 +00:00
