Colin Cross
7d8a028cd3
Merge changes I7e8fcd2e,Ie12d743c am: 547f7393d7
...
am: 8283b186be
2017-02-17 22:36:36 +00:00
Colin Cross
8283b186be
Merge changes I7e8fcd2e,Ie12d743c
...
am: 547f7393d7
2017-02-17 22:34:39 +00:00
Colin Cross
547f7393d7
Merge changes I7e8fcd2e,Ie12d743c
...
* changes:
Add soong_javac_filter to all javac commands
Re-enable dx support
2017-02-17 22:19:08 +00:00
Narayan Kamath
6e5855f9ed
Merge "zipalign: remove support for adding members from gzip sources." am: 96a4bdd9a6 am: 080f68acf5
...
am: 8778583000
2017-02-17 14:24:52 +00:00
Narayan Kamath
8778583000
Merge "zipalign: remove support for adding members from gzip sources." am: 96a4bdd9a6
...
am: 080f68acf5
2017-02-17 14:19:51 +00:00
Narayan Kamath
080f68acf5
Merge "zipalign: remove support for adding members from gzip sources."
...
am: 96a4bdd9a6
2017-02-17 14:14:51 +00:00
Narayan Kamath
96a4bdd9a6
Merge "zipalign: remove support for adding members from gzip sources."
2017-02-17 14:07:34 +00:00
Colin Cross
653470d457
Merge "Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION" am: 738d2de20b am: 4cfa9fcd48
...
am: 5122f6fd67
2017-02-17 03:50:39 +00:00
Colin Cross
5122f6fd67
Merge "Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION" am: 738d2de20b
...
am: 4cfa9fcd48
2017-02-17 03:46:08 +00:00
Colin Cross
4cfa9fcd48
Merge "Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION"
...
am: 738d2de20b
2017-02-17 03:41:07 +00:00
Treehugger Robot
738d2de20b
Merge "Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION"
2017-02-17 03:34:03 +00:00
Colin Cross
d3183bdf40
Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION
...
Create a default list of minor versions (v, vDR1, vDR2, vMR1, vMR2)
for O and P, and propagate TARGET_PLATFORM_VERSION to IS_AT_LEAST_*
variables.
Test: manual
Bug: 34610721
Change-Id: I575caa099d85ee6fbc79538e67dc8d621e81790f
2017-02-16 17:08:03 -08:00
Colin Cross
a341bf0f86
Add soong_javac_filter to all javac commands
...
soong_javac_filter colorizes javac output, and hides noisy messages.
Test: builds
Change-Id: I7e8fcd2e4e1ed3ff530a8ccfe931ceb7e411e0ad
2017-02-16 14:08:45 -08:00
Colin Cross
79e2f73b6c
Re-enable dx support
...
This is a partial revert of commits:
858657366f3ae786125222313f2b2a
2017-02-16 14:08:45 -08:00
Narayan Kamath
b46507ff9e
zipalign: remove support for adding members from gzip sources.
...
This was vestigial code and never actually called anywhere.
Test: make
Bug: 35246701
Change-Id: I9297ac5fa030d369946857414155450635b65410
2017-02-16 10:53:09 +00:00
Vishwath Mohan
7832d8737d
Merge "Blacklist code for CFI." am: 5f50896a7f am: f1e39159c8
...
am: cdf79d7298
2017-02-15 23:41:21 +00:00
Vishwath Mohan
cdf79d7298
Merge "Blacklist code for CFI." am: 5f50896a7f
...
am: f1e39159c8
2017-02-15 23:37:48 +00:00
Vishwath Mohan
f1e39159c8
Merge "Blacklist code for CFI."
...
am: 5f50896a7f
2017-02-15 23:33:54 +00:00
Treehugger Robot
5f50896a7f
Merge "Blacklist code for CFI."
2017-02-15 22:52:46 +00:00
Vishwath Mohan
5b69c06f1f
Blacklist code for CFI.
...
Adds the -fsanitize-blacklist option for CFI, using the built in
blacklist at external/compiler-rt/lib/cfi/cfi_blacklist.txt.
Also refactors the CFI cflags and ldflags into ../soong/cc/makevars.go
to ensure they're consistent across Soong and make projects.
Bug: 30227045
Test: ENABLE_CFI=true m -j40 builds and boots.
Test: The blacklist prevents runtime errors that otherwise occur.
Change-Id: I0c2801ed459a3b9adeb37daff3ca212564801259
2017-02-15 12:48:05 -08:00
Dan Willemsen
72cdc68467
Merge "Fix init rc installation in vendor when LOCAL_MODULE_PATH is set" am: 74dcb9feb3 am: 8d0fda5f9e
...
am: 5721a9140c
2017-02-15 00:59:15 +00:00
Dan Willemsen
5721a9140c
Merge "Fix init rc installation in vendor when LOCAL_MODULE_PATH is set" am: 74dcb9feb3
...
am: 8d0fda5f9e
2017-02-15 00:56:43 +00:00
Dan Willemsen
8d0fda5f9e
Merge "Fix init rc installation in vendor when LOCAL_MODULE_PATH is set"
...
am: 74dcb9feb3
2017-02-15 00:52:15 +00:00
Treehugger Robot
74dcb9feb3
Merge "Fix init rc installation in vendor when LOCAL_MODULE_PATH is set"
2017-02-15 00:45:19 +00:00
Dan Willemsen
ce18a0d8f4
Merge "Support Soong native coverage" am: c9fa07c958 am: 0c2bd30961
...
am: c9f5ca3969
2017-02-15 00:41:45 +00:00
Dan Willemsen
c9f5ca3969
Merge "Support Soong native coverage" am: c9fa07c958
...
am: 0c2bd30961
2017-02-15 00:39:13 +00:00
Dan Willemsen
0c2bd30961
Merge "Support Soong native coverage"
...
am: c9fa07c958
2017-02-15 00:36:43 +00:00
Dan Willemsen
c9fa07c958
Merge "Support Soong native coverage"
2017-02-15 00:32:16 +00:00
Dan Willemsen
054ac67c5b
Merge "Improve installclean to catch more installed files" am: 22b55e1c54 am: af402e14b8
...
am: 81d2e3ce1f
2017-02-14 02:16:44 +00:00
Dan Willemsen
81d2e3ce1f
Merge "Improve installclean to catch more installed files" am: 22b55e1c54
...
am: af402e14b8
2017-02-14 02:14:15 +00:00
Dan Willemsen
af402e14b8
Merge "Improve installclean to catch more installed files"
...
am: 22b55e1c54
2017-02-14 02:12:13 +00:00
Treehugger Robot
22b55e1c54
Merge "Improve installclean to catch more installed files"
2017-02-14 02:06:02 +00:00
Simran Basi
2de40b411a
Merge "Share *_OUT_TESTCASES environment variables with TF" am: 6eeba8f6ec am: 13ced77ea2
...
am: 78be58d869
2017-02-14 01:50:10 +00:00
Simran Basi
78be58d869
Merge "Share *_OUT_TESTCASES environment variables with TF" am: 6eeba8f6ec
...
am: 13ced77ea2
2017-02-14 01:46:34 +00:00
Simran Basi
13ced77ea2
Merge "Share *_OUT_TESTCASES environment variables with TF"
...
am: 6eeba8f6ec
2017-02-14 01:43:09 +00:00
Treehugger Robot
6eeba8f6ec
Merge "Share *_OUT_TESTCASES environment variables with TF"
2017-02-14 01:36:44 +00:00
Android Build Merger (Role)
14e2bd586d
Merge changes from topic 'am-d80037280d644891882d5e01cf30f607' into nyc-mr2-dev-plus-aosp
...
* changes:
[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc43ce29b8a94b0cef41b768f86884a97c901cec8b2a150db654728ecd6fdd558300f46bf764c206e6d533ca31c934a18b463ab1cfaef42414fae3e67ef3ce06ee4051e00b70b5100c627eb315be6d3bbb4ed3878489884702d9919d466175346bc19d8140c53a64664c9caff84dcbe2f222829e069586d29d78f510b8ca134f2511b658bc2b6dc86e62cac071f6762121356
2017-02-13 23:52:37 +00:00
Adam Seaton
e17cce6f89
[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am: 3ce29b8a94 am: b0cef41b76 -s ours am: 8f86884a97 -s ours am: c901cec8b2 am: a150db6547 -s ours am: 28ecd6fdd5 am: 58300f46bf am: 764c206e6d am: 533ca31c93 -s ours am: 4a18b463ab am: 1cfaef4241 am: 4fae3e67ef am: 3ce06ee405
...
am: df880da682
2017-02-13 23:52:20 +00:00
Adam Seaton
ea9940c389
[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am: 3ce29b8a94 am: b0cef41b76 -s ours am: 8f86884a97 -s ours am: c901cec8b2 am: a150db6547 -s ours am: 28ecd6fdd5 am: 58300f46bf am: 764c206e6d am: 533ca31c93 -s ours am: 4a18b463ab am: 1cfaef4241 am: 4fae3e67ef am: 3ce06ee405
...
am: 1e00b70b51
2017-02-13 23:52:20 +00:00
Adam Seaton
79763ee2d5
[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am: 5be6d3bbb4 am: ed38784898 -s ours am: 84702d9919 -s ours am: d466175346 am: bc19d8140c -s ours am: 53a64664c9 am: caff84dcbe am: 2f222829e0 am: 69586d29d7 -s ours am: 8f510b8ca1 am: 34f2511b65 am: 8bc2b6dc86 am: e62cac071f
...
am: a68b9b001e
2017-02-13 23:52:11 +00:00
Adam Seaton
dd3ca7380e
[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am: 5be6d3bbb4 am: ed38784898 -s ours am: 84702d9919 -s ours am: d466175346 am: bc19d8140c -s ours am: 53a64664c9 am: caff84dcbe am: 2f222829e0 am: 69586d29d7 -s ours am: 8f510b8ca1 am: 34f2511b65 am: 8bc2b6dc86 am: e62cac071f
...
am: 6762121356
2017-02-13 23:52:11 +00:00
Adam Seaton
df880da682
[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am: 3ce29b8a94 am: b0cef41b76 -s ours am: 8f86884a97 -s ours am: c901cec8b2 am: a150db6547 -s ours am: 28ecd6fdd5 am: 58300f46bf am: 764c206e6d am: 533ca31c93 -s ours am: 4a18b463ab am: 1cfaef4241 am: 4fae3e67ef
...
am: 3ce06ee405
2017-02-13 23:49:19 +00:00
Adam Seaton
1e00b70b51
[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am: 3ce29b8a94 am: b0cef41b76 -s ours am: 8f86884a97 -s ours am: c901cec8b2 am: a150db6547 -s ours am: 28ecd6fdd5 am: 58300f46bf am: 764c206e6d am: 533ca31c93 -s ours am: 4a18b463ab am: 1cfaef4241 am: 4fae3e67ef
...
am: 3ce06ee405
2017-02-13 23:49:18 +00:00
Adam Seaton
a68b9b001e
[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am: 5be6d3bbb4 am: ed38784898 -s ours am: 84702d9919 -s ours am: d466175346 am: bc19d8140c -s ours am: 53a64664c9 am: caff84dcbe am: 2f222829e0 am: 69586d29d7 -s ours am: 8f510b8ca1 am: 34f2511b65 am: 8bc2b6dc86
...
am: e62cac071f
2017-02-13 23:49:11 +00:00
Adam Seaton
6762121356
[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am: 5be6d3bbb4 am: ed38784898 -s ours am: 84702d9919 -s ours am: d466175346 am: bc19d8140c -s ours am: 53a64664c9 am: caff84dcbe am: 2f222829e0 am: 69586d29d7 -s ours am: 8f510b8ca1 am: 34f2511b65 am: 8bc2b6dc86
...
am: e62cac071f
2017-02-13 23:49:11 +00:00
Android Build Merger (Role)
ee5593c286
Merge changes from topic 'am-bdb31204347044778e7bedc5806f1310' into nyc-mr2-dev-plus-aosp
...
* changes:
[DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev am: e2eff3f7eeea757ba69037aab729cf8a59a2eda23746e17d30b15a2623ac4be162ac7fc8b7e08b503e0d1c32da437c3dd5d321f6e17ffd839b434650ffab69998a0f30aa980105ebddebe5101c043b1758086ff4aafec9d76740ea0d4b0e5445deda3682235702c0e06063089d0785782debf1da09c2fd8b
2017-02-13 23:47:02 +00:00
Adam Seaton
3ce06ee405
[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am: 3ce29b8a94 am: b0cef41b76 -s ours am: 8f86884a97 -s ours am: c901cec8b2 am: a150db6547 -s ours am: 28ecd6fdd5 am: 58300f46bf am: 764c206e6d am: 533ca31c93 -s ours am: 4a18b463ab am: 1cfaef4241
...
am: 4fae3e67ef
2017-02-13 23:46:46 +00:00
Adam Seaton
b17f4329ed
[DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev am: e2eff3f7ee -s ours am: ea757ba690 am: 37aab729cf -s ours am: 8a59a2eda2 am: 3746e17d30 am: b15a2623ac am: 4be162ac7f -s ours am: c8b7e08b50 am: 3e0d1c32da am: 437c3dd5d3 am: 21f6e17ffd
...
am: 0e6b3934a2
2017-02-13 23:46:46 +00:00
Adam Seaton
71a2405abd
[DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev am: e2eff3f7ee -s ours am: ea757ba690 am: 37aab729cf -s ours am: 8a59a2eda2 am: 3746e17d30 am: b15a2623ac am: 4be162ac7f -s ours am: c8b7e08b50 am: 3e0d1c32da am: 437c3dd5d3 am: 21f6e17ffd
...
am: 839b434650
2017-02-13 23:46:46 +00:00
Adam Seaton
e62cac071f
[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am: 5be6d3bbb4 am: ed38784898 -s ours am: 84702d9919 -s ours am: d466175346 am: bc19d8140c -s ours am: 53a64664c9 am: caff84dcbe am: 2f222829e0 am: 69586d29d7 -s ours am: 8f510b8ca1 am: 34f2511b65
...
am: 8bc2b6dc86
2017-02-13 23:46:39 +00:00
