724d458547
Merge "Revert "Build: Bring back SDK dependencies"" am: 2bbeae7f8a
...
am: f606cc1677
2016-11-30 00:53:09 +00:00
f606cc1677
Merge "Revert "Build: Bring back SDK dependencies""
...
am: 2bbeae7f8a
2016-11-30 00:48:39 +00:00
2bbeae7f8a
Merge "Revert "Build: Bring back SDK dependencies""
2016-11-30 00:39:34 +00:00
4c6efa0947
Merge changes from topic 'basic_vndk' am: e69f15c9dc
...
am: 474bba8831
2016-11-29 20:47:46 +00:00
6e0c0da5dc
Prohibit host modules from using LOCAL_COPY_HEADERS am: 6e51ef61a7
...
am: dc556b4bc0
2016-11-29 20:47:40 +00:00
2e300cdb70
Add basic VNDK support in Make am: bab0fa6928
...
am: 323efd3035
2016-11-29 20:47:33 +00:00
4d20d14143
Remove GLOBAL_LD_DIRS am: e5836c4bb0
...
am: 28cf7d49ab
2016-11-29 20:47:27 +00:00
474bba8831
Merge changes from topic 'basic_vndk'
...
am: e69f15c9dc
2016-11-29 20:42:40 +00:00
dc556b4bc0
Prohibit host modules from using LOCAL_COPY_HEADERS
...
am: 6e51ef61a7
2016-11-29 20:42:37 +00:00
323efd3035
Add basic VNDK support in Make
...
am: bab0fa6928
2016-11-29 20:42:32 +00:00
28cf7d49ab
Remove GLOBAL_LD_DIRS
...
am: e5836c4bb0
2016-11-29 20:42:26 +00:00
e69f15c9dc
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
2016-11-29 20:36:04 +00:00
1eb115c6e8
Makefile: Pack verity_verifier into otatools.zip. am: 7bb3aff71c am: ad8924117d am: 7981d953a9
...
am: 41fd473e45
2016-11-29 00:28:07 +00:00
41fd473e45
Makefile: Pack verity_verifier into otatools.zip. am: 7bb3aff71c am: ad8924117d
...
am: 7981d953a9
2016-11-29 00:24:05 +00:00
7981d953a9
Makefile: Pack verity_verifier into otatools.zip. am: 7bb3aff71c
...
am: ad8924117d
2016-11-29 00:19:36 +00:00
ad8924117d
Makefile: Pack verity_verifier into otatools.zip.
...
am: 7bb3aff71c
2016-11-29 00:15:05 +00:00
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
0badc6ba69
DO NOT MERGE: build_image: add padding to match partition size
...
am: 9a675c94d3
2016-11-29 00:05:40 +00:00
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
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
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
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
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
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
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
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
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
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
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
121f83aa77
build: tools: Add json collection of installed files with hashes.
...
am: 3c97fa78cd
2016-11-28 22:16:42 +00:00
80955ccc97
releasetools: Support verity signer args. am: c7814837a0 am: 8a6d94c9aa am: b31f486d75
...
am: 53a1acf53b
2016-11-28 22:16:08 +00:00
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
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
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
7442e47c84
Merge "Makefile: Pack verity_verifier into otatools.zip." am: 31543713fc
...
am: 5cd53f7e22
2016-11-28 18:17:57 +00:00
24ed10c0cb
Makefile: Pack verity_verifier into otatools.zip. am: 7f02f3413b
...
am: 3b35352e1b
2016-11-28 18:17:42 +00:00
5cd53f7e22
Merge "Makefile: Pack verity_verifier into otatools.zip."
...
am: 31543713fc
2016-11-28 18:13:45 +00:00
3b35352e1b
Makefile: Pack verity_verifier into otatools.zip.
...
am: 7f02f3413b
2016-11-28 18:13:43 +00:00
7bb3aff71c
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 7f02f3413b
2016-11-28 10:05:45 -08:00
31543713fc
Merge "Makefile: Pack verity_verifier into otatools.zip."
2016-11-28 18:04:04 +00:00
7f02f3413b
Makefile: Pack verity_verifier into otatools.zip.
...
verity_verifier is needed when verifying verity metadata.
Bug: 32173582
Test: `m otatools-package`
Change-Id: I63fdeb75cdca10ea38c1df978d64701acdd4c1db
2016-11-22 15:36:57 -08:00
0be9b84218
Merge "Update warn.py for new Error Prone diagnostics" am: 7ed3af23a8
...
am: 1eef968704
2016-11-22 18:53:21 +00:00
1eef968704
Merge "Update warn.py for new Error Prone diagnostics"
...
am: 7ed3af23a8
2016-11-22 18:50:21 +00:00
7ed3af23a8
Merge "Update warn.py for new Error Prone diagnostics"
2016-11-22 18:43:51 +00:00
8a7b25c736
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
2016-11-22 10:35:07 -08:00
28b96d1470
Merge "DO NOT MERGE: build_image: add padding to match partition size" into cw-f-dev
2016-11-20 06:22:17 +00:00
1cb992bc8e
Merge "Support `LOCAL_SDK_VERSION := current` for NDK." am: c7d2fe614e
...
am: 6cac9ba834
2016-11-18 19:12:37 +00:00
6cac9ba834
Merge "Support `LOCAL_SDK_VERSION := current` for NDK."
...
am: c7d2fe614e
2016-11-18 19:09:36 +00:00
c7d2fe614e
Merge "Support `LOCAL_SDK_VERSION := current` for NDK."
2016-11-18 19:04:40 +00:00
5d9c6165d0
Revert "Build: Bring back SDK dependencies"
...
This reverts commit ff00c5d78f
2016-11-17 19:42:51 -08:00
Andreas Gampe