OSDN Git Service
Dan Willemsen [Wed, 21 Sep 2016 19:50:50 +0000 (19:50 +0000)]
Merge "Package up proguard jack_dictionary" am:
f7d1a6d75f
am:
e875b39791
Change-Id: Ibe68192917534f603872e698131534e55973edae
Dan Willemsen [Wed, 21 Sep 2016 19:48:20 +0000 (19:48 +0000)]
Merge "Package up proguard jack_dictionary"
am:
f7d1a6d75f
Change-Id: Ia426e7d0fea6d0c6fc610d9d9fed20c9d2159ed6
Dan Willemsen [Wed, 21 Sep 2016 19:39:47 +0000 (19:39 +0000)]
Merge "Package up proguard jack_dictionary"
Adam Seaton [Wed, 21 Sep 2016 18:27:42 +0000 (18:27 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68 am:
e13d8888a8 am:
25019ad31d am:
3ffb2d23c2 am:
a983e8e796 am:
e8e35c0327 am:
5673cc319b am:
5fd0f92405
am:
ceda55a70c
Change-Id: I85a55326c07e27a78e37dc91d4fde241abc8aa40
Adam Seaton [Wed, 21 Sep 2016 18:27:05 +0000 (18:27 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e am:
dafa9bc77b am:
d7ae210272 am:
c184e47cc5 am:
595661f7cb -s ours am:
9655ec5d13 am:
e63569c787 am:
a97cf974db am:
0ea40f86fe
am:
7bdb62e453
Change-Id: I031149cea0deffbc575799abd7a7d3adb4aafe8f
Adam Seaton [Wed, 21 Sep 2016 18:24:04 +0000 (18:24 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68 am:
e13d8888a8 am:
25019ad31d am:
3ffb2d23c2 am:
a983e8e796 am:
e8e35c0327 am:
5673cc319b
am:
5fd0f92405
Change-Id: I673419ace743bdffeb04f671f25a0d8f43594925
Adam Seaton [Wed, 21 Sep 2016 18:22:04 +0000 (18:22 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e am:
dafa9bc77b am:
d7ae210272 am:
c184e47cc5 am:
595661f7cb -s ours am:
9655ec5d13 am:
e63569c787 am:
a97cf974db
am:
0ea40f86fe
Change-Id: I85ff5b04c174b94b4be19f5ba6b3f1ae7c525932
Adam Seaton [Wed, 21 Sep 2016 18:22:03 +0000 (18:22 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68 am:
e13d8888a8 am:
25019ad31d am:
3ffb2d23c2 am:
a983e8e796 am:
e8e35c0327
am:
5673cc319b
Change-Id: I3c89353174d4c1033e1d8e4935217c888ee0a859
Adam Seaton [Wed, 21 Sep 2016 18:19:32 +0000 (18:19 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e am:
dafa9bc77b am:
d7ae210272 am:
c184e47cc5 am:
595661f7cb -s ours am:
9655ec5d13 am:
e63569c787
am:
a97cf974db
Change-Id: Ia7d56ec19a0c1a9222eaaaae653bd5b9d3554ca7
Adam Seaton [Wed, 21 Sep 2016 18:19:32 +0000 (18:19 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68 am:
e13d8888a8 am:
25019ad31d am:
3ffb2d23c2 am:
a983e8e796
am:
e8e35c0327
Change-Id: I62c5f469c38faf8565656ac6bf436e20454220dc
Adam Seaton [Wed, 21 Sep 2016 18:17:02 +0000 (18:17 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e am:
dafa9bc77b am:
d7ae210272 am:
c184e47cc5 am:
595661f7cb -s ours am:
9655ec5d13
am:
e63569c787
Change-Id: If7985374a54fe95592303ee6a81f55c0be9f1b11
Adam Seaton [Wed, 21 Sep 2016 18:17:02 +0000 (18:17 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68 am:
e13d8888a8 am:
25019ad31d am:
3ffb2d23c2
am:
a983e8e796
Change-Id: Iad93276510ea4f7742b91e9ca5bfeb7967f53294
Adam Seaton [Wed, 21 Sep 2016 18:14:48 +0000 (18:14 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68 am:
e13d8888a8 am:
25019ad31d
am:
3ffb2d23c2
Change-Id: Id10071c0a2209df3cd0b8232b9713f7e29536d55
Adam Seaton [Wed, 21 Sep 2016 18:14:47 +0000 (18:14 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e am:
dafa9bc77b am:
d7ae210272 am:
c184e47cc5 am:
595661f7cb -s ours
am:
9655ec5d13
Change-Id: I10b3ed85f30b7080e4f98b12597962fb593eec2e
Adam Seaton [Wed, 21 Sep 2016 18:12:02 +0000 (18:12 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68 am:
e13d8888a8
am:
25019ad31d
Change-Id: I547d3e7830f4815f0483c236192bd099bef5cc18
Adam Seaton [Wed, 21 Sep 2016 18:12:00 +0000 (18:12 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e am:
dafa9bc77b am:
d7ae210272 am:
c184e47cc5
am:
595661f7cb -s ours
Change-Id: Idf6bdb2bc18328522a49974cc52db13b92fc54ea
Adam Seaton [Wed, 21 Sep 2016 18:09:31 +0000 (18:09 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68
am:
e13d8888a8
Change-Id: I996544a25a9f2c8749039885ce28dfe25c86008f
Adam Seaton [Wed, 21 Sep 2016 18:07:00 +0000 (18:07 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e am:
dafa9bc77b am:
d7ae210272
am:
c184e47cc5
Change-Id: I262c282ff61013c546b70ce4b026ab8f1f074488
Adam Seaton [Wed, 21 Sep 2016 18:07:00 +0000 (18:07 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2
am:
57370e1f68
Change-Id: I38ac268882f035cb3ede21264dc09cb7636b2e6d
Adam Seaton [Wed, 21 Sep 2016 18:04:29 +0000 (18:04 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e am:
dafa9bc77b
am:
d7ae210272
Change-Id: I03667caf5a56aad45375984eafd56520f1c4e881
Adam Seaton [Wed, 21 Sep 2016 18:04:29 +0000 (18:04 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1
am:
0f9242c4d2
Change-Id: Ib0f308deca6d9cb6f25a8c0b2ad710676a936f49
Adam Seaton [Wed, 21 Sep 2016 18:02:15 +0000 (18:02 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e
am:
dafa9bc77b
Change-Id: I84eb63c40130faa756e3de022de1a2c4467a6b85
Adam Seaton [Wed, 21 Sep 2016 18:01:58 +0000 (18:01 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1
am:
fcc6e603c1
Change-Id: I0f514c2c0eaaac94140b8cdc8407478abc606c35
Adam Seaton [Wed, 21 Sep 2016 17:59:28 +0000 (17:59 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72
am:
4fd819741e
Change-Id: I309c174e2924614dd3197f33eff36063e9acc21a
Adam Seaton [Wed, 21 Sep 2016 17:59:28 +0000 (17:59 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev
am:
e5ecc61cf1
Change-Id: I6cabebaf6f5e39faf4bf0417eb7e88479d96947a
Adam Seaton [Wed, 21 Sep 2016 17:56:59 +0000 (17:56 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c
am:
bf8a1cef72
Change-Id: I9f4709ddb9a9aec34efa4134d9cf652d8de81177
Adam Seaton [Wed, 21 Sep 2016 17:55:19 +0000 (17:55 +0000)]
Merge changes I1489eaf6,I8ee8f978 into nyc-dev
am:
575add3bcf
Change-Id: I10fd35297b5e662b9eb7804f3eea6fbea761ce12
Adam Seaton [Wed, 21 Sep 2016 17:55:18 +0000 (17:55 +0000)]
Updating security string to 2016-11-05 on nyc-dev
am:
002132648d
Change-Id: I00ffcb925f579ad2e404dafeaa2d85cf76e021f3
Adam Seaton [Wed, 21 Sep 2016 17:54:28 +0000 (17:54 +0000)]
Update Security String to 2016-11-01 b/
31618336
am:
2a03720e6c
Change-Id: I0991ac69c8effc6d263c051567b6111fd0416e65
Adam Seaton [Wed, 21 Sep 2016 17:51:40 +0000 (17:51 +0000)]
Updating Security String to 2016-11-01 on nyc-dev
am:
2a00b24144
Change-Id: I19a783b2e608de9b3be07f442a9762336f2105c1
Adam Seaton [Wed, 21 Sep 2016 17:50:21 +0000 (17:50 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev
Adam Seaton [Wed, 21 Sep 2016 17:47:06 +0000 (17:47 +0000)]
Merge changes I1489eaf6,I8ee8f978 into nyc-dev
* changes:
Updating security string to 2016-11-05 on nyc-dev
Updating Security String to 2016-11-01 on nyc-dev
Colin Cross [Wed, 21 Sep 2016 02:09:54 +0000 (02:09 +0000)]
Merge "Replace usages of my_register_name with my_all_targets" am:
077d9d5fe7
am:
e373117cac
Change-Id: I4636a410ec035c21fc20c04f47cada7b08c31b8e
Colin Cross [Wed, 21 Sep 2016 02:05:53 +0000 (02:05 +0000)]
Merge "Replace usages of my_register_name with my_all_targets"
am:
077d9d5fe7
Change-Id: I7e833dab3ff53e8524a227038c8de92e8e67393c
Treehugger Robot [Wed, 21 Sep 2016 00:38:59 +0000 (00:38 +0000)]
Merge "Replace usages of my_register_name with my_all_targets"
Colin Cross [Tue, 20 Sep 2016 23:01:28 +0000 (16:01 -0700)]
Replace usages of my_register_name with my_all_targets
A few module types add extra dependencies on $(my_register_name), move
them to $(my_all_targets) so that they are built for mm and mma too.
Bug:
31526036
Test: mmm framework
Change-Id: I2e594ce771451a99691739b963f4ce517e9dd595
Adam Seaton [Tue, 20 Sep 2016 22:56:14 +0000 (22:56 +0000)]
Updating Security String to 2016-11-05 on mnc-dev b/
31618336 am:
dcfd738833 am:
fac5535f75 am:
405437474b am:
4afc7d56eb -s ours
am:
1ddbc7984a
Change-Id: I5abbd7303c060bc397640e8fb5f128184c25239a
Adam Seaton [Tue, 20 Sep 2016 22:53:42 +0000 (22:53 +0000)]
Updating Security String to 2016-11-05 on mnc-dev b/
31618336 am:
dcfd738833 am:
fac5535f75 am:
405437474b
am:
4afc7d56eb -s ours
Change-Id: I254e7b694e8be596854e15cdd56dc3f26794b3a0
Adam Seaton [Tue, 20 Sep 2016 22:51:13 +0000 (22:51 +0000)]
Updating Security String to 2016-11-01 on mnc-dev b/
31618336 am:
62b28398ba am:
f3b89d8392 am:
9ccd48f7d1 am:
8720071b96 -s ours
am:
d5e90e9fa3
Change-Id: I7cf99f870f2095d1243ca54b7085accbb2d5ba76
Adam Seaton [Tue, 20 Sep 2016 22:48:41 +0000 (15:48 -0700)]
Updating security string to 2016-11-05 on nyc-dev
b/
31618336
Change-Id: I1489eaf64c59dc0f175eb9220a900c68e262b3dd
Adam Seaton [Tue, 20 Sep 2016 22:48:40 +0000 (22:48 +0000)]
Updating Security String to 2016-11-01 on mnc-dev b/
31618336 am:
62b28398ba am:
f3b89d8392 am:
9ccd48f7d1
am:
8720071b96 -s ours
Change-Id: If082fc1b10dcbe9cb83320d086a2f0c336171f0e
Adam Seaton [Tue, 20 Sep 2016 22:47:16 +0000 (15:47 -0700)]
Updating Security String to 2016-11-01 on nyc-dev
b/
31618336
Change-Id: I8ee8f978fbbf30efb1abca85cf374fc440a1baf7
Adam Seaton [Tue, 20 Sep 2016 22:38:43 +0000 (22:38 +0000)]
Updating Security String to 2016-11-05 on mnc-dev b/
31618336 am:
dcfd738833 am:
fac5535f75
am:
405437474b
Change-Id: Iefac549d3a988284b88653120c7469e278e95cd4
Adam Seaton [Tue, 20 Sep 2016 22:38:39 +0000 (22:38 +0000)]
Updating Security String to 2016-11-01 on mnc-dev b/
31618336 am:
62b28398ba am:
f3b89d8392
am:
9ccd48f7d1
Change-Id: I79e6fa0c2a6b026487bc1be8c51194ddd013f717
Adam Seaton [Tue, 20 Sep 2016 22:36:19 +0000 (22:36 +0000)]
Updating Security String to 2016-11-05 on mnc-dev b/
31618336 am:
dcfd738833
am:
fac5535f75
Change-Id: I8204ecf14fc6605265b46c28916eca6ede9858ae
Adam Seaton [Tue, 20 Sep 2016 22:36:09 +0000 (22:36 +0000)]
Updating Security String to 2016-11-01 on mnc-dev b/
31618336 am:
62b28398ba
am:
f3b89d8392
Change-Id: Ic3ad8fe00b74ab5b0ec7dc255366569e286565d8
Adam Seaton [Tue, 20 Sep 2016 22:33:15 +0000 (22:33 +0000)]
Updating Security String to 2016-11-05 on mnc-dev b/
31618336
am:
dcfd738833
Change-Id: I773c8e574286057cb8f33413c027276023fb32da
Adam Seaton [Tue, 20 Sep 2016 22:33:08 +0000 (22:33 +0000)]
Updating Security String to 2016-11-01 on mnc-dev b/
31618336
am:
62b28398ba
Change-Id: I97cbe642d516b08d52c08b4e93ee4090493b1b96
Dan Willemsen [Thu, 1 Sep 2016 18:02:43 +0000 (11:02 -0700)]
Package up proguard jack_dictionary
Bug:
31182185
Test: m dist in an unbundled branch
Change-Id: I7ee1ba076cfa03f294f8231f6bdd8fa8df5557af
Adam Seaton [Tue, 20 Sep 2016 17:06:50 +0000 (10:06 -0700)]
Updating Security String to 2016-11-05 on mnc-dev
b/
31618336
Change-Id: I3c9459553fdc89cacdf74d5e5801871b7192bc51
Adam Seaton [Tue, 20 Sep 2016 17:03:47 +0000 (10:03 -0700)]
Updating Security String to 2016-11-01 on mnc-dev
b/
31618336
Change-Id: I18b3a0d690ab238fcd3cafa65b873ce7432c9c25
Adam Seaton [Tue, 20 Sep 2016 16:34:22 +0000 (09:34 -0700)]
Update Security String to 2016-11-01
b/
31618336
Change-Id: Ib31ba11912f144ff34edb66dc693b92f6fc0c24b
Paul Duffin [Tue, 20 Sep 2016 11:59:48 +0000 (11:59 +0000)]
Merge "Add targets for building individual modules using javac" am:
cb6f7c2d86
am:
da3fdebc1d
Change-Id: Iff02ac85b5e197135a9729e725a55cb5715cc2a8
Paul Duffin [Tue, 20 Sep 2016 11:56:48 +0000 (11:56 +0000)]
Merge "Add targets for building individual modules using javac"
am:
cb6f7c2d86
Change-Id: Ic529ef16ed95c88bd32c68b050d2b784a6d6cf71
Paul Duffin [Tue, 20 Sep 2016 11:51:40 +0000 (11:51 +0000)]
Merge "Add targets for building individual modules using javac"
Dan Willemsen [Mon, 19 Sep 2016 23:21:16 +0000 (23:21 +0000)]
Merge "Fix link_type checking" am:
665cda08f0
am:
1347d959de
Change-Id: Ia7ba9accbfa4c7de8843d5554a62524500509d5b
Dan Willemsen [Mon, 19 Sep 2016 22:40:37 +0000 (22:40 +0000)]
Merge "Fix link_type checking"
am:
665cda08f0
Change-Id: I95ca55160ae6a8b3a5d05a2a2cbc653dc3855981
Dan Willemsen [Mon, 19 Sep 2016 21:54:08 +0000 (21:54 +0000)]
Merge "Fix link_type checking"
Tao Bao [Mon, 19 Sep 2016 17:39:35 +0000 (17:39 +0000)]
Merge "Add a script that verifies OTA package signature." am:
3b0cb6e842
am:
3db2c7fedd
Change-Id: I017800761e4ab883af62d42075542fb250cde22c
Tao Bao [Mon, 19 Sep 2016 17:36:35 +0000 (17:36 +0000)]
Merge "Add a script that verifies OTA package signature."
am:
3b0cb6e842
Change-Id: Ic0441a0652caf75660d599a5b773080c47f01f79
Treehugger Robot [Mon, 19 Sep 2016 17:28:01 +0000 (17:28 +0000)]
Merge "Add a script that verifies OTA package signature."
Paul Duffin [Thu, 15 Sep 2016 13:34:42 +0000 (14:34 +0100)]
Add targets for building individual modules using javac
This is needed in order to be able to run error prone (which is
a plugin replacement for javac) on a subset of the java code.
Bug:
31507496
Test: Build javac-check-core-tests and check the resulting JAR
Change-Id: I5a556920572fcdad7b39d67e3f00fe0e0f1f8f46
Dan Willemsen [Sat, 17 Sep 2016 02:38:49 +0000 (02:38 +0000)]
Merge "Only update previous product config when changed" am:
2fcacb5a22
am:
5f381cfcb2
Change-Id: I77598bb8449c8b4b83e93453dd46a658af66bab1
Dan Willemsen [Sat, 17 Sep 2016 02:36:20 +0000 (02:36 +0000)]
Merge "Only update previous product config when changed"
am:
2fcacb5a22
Change-Id: I40024f4a6539130aa9395d6a923a57cd5fe49960
Dan Willemsen [Sat, 17 Sep 2016 02:29:06 +0000 (02:29 +0000)]
Merge "Only update previous product config when changed"
Tao Bao [Tue, 13 Sep 2016 18:13:48 +0000 (11:13 -0700)]
Add a script that verifies OTA package signature.
Currently it supports verifying packages signed with RSA algorithms
(v1-v4 as in bootable/recovery/verifier.cpp). No support for ECDSA (v5)
signed packages yet.
$ ./build/tools/releasetools/check_ota_package_signature.py \
bootable/recovery/tests/testdata/testkey_v1.x509.pem \
bootable/recovery/tests/testdata/otasigned_v1.zip
Package: bootable/recovery/tests/testdata/otasigned_v1.zip
Certificate: bootable/recovery/tests/testdata/testkey_v1.x509.pem
Comment length: 1738
Signed data length: 2269
Use SHA-256: False
Digest:
115e688ec3b77743070b743453e2fc6ce8754484
VERIFIED
Bug:
31523193
Test: Used the tool to verify existing packages (like above).
Change-Id: I71d3569e858c729cb64825c5c7688ededc397aa8
Dan Willemsen [Fri, 16 Sep 2016 22:02:31 +0000 (22:02 +0000)]
Merge "Remove objclean" am:
1d4b79dde2
am:
beaa6df59f
Change-Id: I73a68779f7b2e321c66e6102dca290828a9cd25f
Dan Willemsen [Fri, 16 Sep 2016 21:58:57 +0000 (21:58 +0000)]
Merge "Remove objclean"
am:
1d4b79dde2
Change-Id: I89d814220509513c5948a811bfcc75241de6b3cc
Treehugger Robot [Fri, 16 Sep 2016 21:46:20 +0000 (21:46 +0000)]
Merge "Remove objclean"
Dan Willemsen [Fri, 16 Sep 2016 17:03:22 +0000 (10:03 -0700)]
Only update previous product config when changed
I'm working on removing the --ignore_dirty=$(OUT_DIR)/% argument from
Kati. If we're always writing to a file that we're also reading, then
with that flag removed, we'll always reparse all the makefiles.
So instead, use the method from the generated java file cleanup where we
read from a "previous" file, write to a "current" file, then use a
cmp || mv to overwrite the "previous" file if necessary. When the flag
is removed, this will cause Kati to need to run twice any time this
changes, but it's better than forever.
Bug:
30947985
Test: Switch between aosp_arm-eng and full-eng
Change-Id: Id2d1445809b60ce26700bb2aca765df3b5c2b360
Dan Willemsen [Fri, 16 Sep 2016 05:03:04 +0000 (22:03 -0700)]
Remove objclean
We don't need to manually remove objects when switching SANITIZE_TARGET
-- that will be handled by Ninja noticing that the command lines are
different.
Bug:
30947985
Test: None
Change-Id: I83c15981cf6ea258bb7fa85490b0b1ede1058aa6
Dan Albert [Fri, 16 Sep 2016 06:51:12 +0000 (06:51 +0000)]
Merge changes from topics 'ndk-compiler-rt_extras', 'ndk-libc++-libdl' am:
7b351cadfc
am:
ad53acf331
Change-Id: Icf51316deae33343492640da46f2926acf81c2cc
Dan Albert [Fri, 16 Sep 2016 06:51:03 +0000 (06:51 +0000)]
Use libcompiler-rt_extras with NDK builds. am:
c28e4bcb1c
am:
d042352816
Change-Id: Icb272f25c0c94ebfed549382eefd36363b0b7a1f
Dan Albert [Fri, 16 Sep 2016 06:50:54 +0000 (06:50 +0000)]
Always link libdl with libc++ for the NDK. am:
2936a1e84b
am:
ec6223ec3c
Change-Id: I18fb4af4cd80609ba7bec3d23509df3d3cb6ecf0
Dan Albert [Fri, 16 Sep 2016 06:45:34 +0000 (06:45 +0000)]
Merge changes from topics 'ndk-compiler-rt_extras', 'ndk-libc++-libdl'
am:
7b351cadfc
Change-Id: Ibce0de2cd113ccb1f97d9f83865be89961c22c54
Dan Albert [Fri, 16 Sep 2016 06:45:32 +0000 (06:45 +0000)]
Use libcompiler-rt_extras with NDK builds.
am:
c28e4bcb1c
Change-Id: I21541bee4a55951601b6cd110ec78ae94a5da94c
Dan Albert [Fri, 16 Sep 2016 06:45:23 +0000 (06:45 +0000)]
Always link libdl with libc++ for the NDK.
am:
2936a1e84b
Change-Id: I41b0ce041345477931b0b0f59212fcda31899259
Treehugger Robot [Fri, 16 Sep 2016 06:40:32 +0000 (06:40 +0000)]
Merge changes from topics 'ndk-compiler-rt_extras', 'ndk-libc++-libdl'
* changes:
Use libcompiler-rt_extras with NDK builds.
Always link libdl with libc++ for the NDK.
Ryan Campbell [Fri, 16 Sep 2016 02:16:02 +0000 (02:16 +0000)]
Merge "Fix typo in coverage target out path." am:
c6507670f2
am:
1fd609359d
Change-Id: I3650bd75e4b3a8e03f613e430c65f62ef63aaf37
Ryan Campbell [Fri, 16 Sep 2016 02:13:32 +0000 (02:13 +0000)]
Merge "Fix typo in coverage target out path."
am:
c6507670f2
Change-Id: I09460fa54a7f63fefda7b648d615cf61ce86f778
Treehugger Robot [Fri, 16 Sep 2016 02:06:18 +0000 (02:06 +0000)]
Merge "Fix typo in coverage target out path."
Ryan Campbell [Fri, 16 Sep 2016 00:32:13 +0000 (17:32 -0700)]
Fix typo in coverage target out path.
Change-Id: I4a448708ab74e08b2c515039ee5d71c32861214e
Dan Willemsen [Thu, 15 Sep 2016 04:38:29 +0000 (21:38 -0700)]
Fix link_type checking
This was printing "error:", but not actually triggering an error.
Instead of trying to write a single line bash script to handle this,
move the actual check into python. This allows us to print all of the
errors for a single module before triggering the failure.
Also updates the warning format and the warn.py script to properly parse
these warning. Many of the java:sdk -> java:platform warnings are false
positives due to the lack of LOCAL_SDK_VERSION markings on prebuilts.
Individual tags can be marked as warnings now, which lets us check for
system libraries linking against vendor libraries (which won't work on
AOSP). I'm not sure this is a completely valid check, which one reason
that it's just a warning.
Test: m all_link_types (with some missing libs commented out)
Change-Id: I333e418c9a4511b7c7e826891ae481da08fbf6f9
Colin Cross [Thu, 15 Sep 2016 18:41:57 +0000 (18:41 +0000)]
Merge "Remove SRC_SYSTEM_HEADERS" am:
4a6862e59b
am:
195857c6dd
Change-Id: I28abe9c363ddd963fb5010586fc2cddaee89c015
Colin Cross [Thu, 15 Sep 2016 18:38:57 +0000 (18:38 +0000)]
Merge "Remove SRC_SYSTEM_HEADERS"
am:
4a6862e59b
Change-Id: I7864a2f482240f9e310d913d3dec07f99ad20c67
Treehugger Robot [Thu, 15 Sep 2016 18:27:45 +0000 (18:27 +0000)]
Merge "Remove SRC_SYSTEM_HEADERS"
Colin Cross [Thu, 15 Sep 2016 16:29:15 +0000 (09:29 -0700)]
Remove SRC_SYSTEM_HEADERS
It is inherited from Soong now.
Bug:
31492149
Change-Id: Ia9bfd9662dba16032dac68b55b4f0743c0688139
Yoshisato Yanagisawa [Thu, 15 Sep 2016 03:53:43 +0000 (03:53 +0000)]
Merge "goma.mk: do not start goma compiler_proxy if NOSTART_GOMA is set." am:
766c348748
am:
4d5f3043a2
Change-Id: I1cb95bee90e922a74d121f0ed78dc08953cfa735
Yoshisato Yanagisawa [Thu, 15 Sep 2016 03:50:44 +0000 (03:50 +0000)]
Merge "goma.mk: do not start goma compiler_proxy if NOSTART_GOMA is set."
am:
766c348748
Change-Id: I14edc0203aeadfc85a46bc68fa849c4f3d231b87
Treehugger Robot [Thu, 15 Sep 2016 03:41:24 +0000 (03:41 +0000)]
Merge "goma.mk: do not start goma compiler_proxy if NOSTART_GOMA is set."
Dan Albert [Wed, 14 Sep 2016 23:08:48 +0000 (16:08 -0700)]
Use libcompiler-rt_extras with NDK builds.
We want to build things in CTS (things built against the NDK) with
integer overflow checks. Some projects in the tree also make explicit
calls to the overflow checked builtins, and those projects need to be
built with the NDK (external/dng_sdk is the specific example that
brought this up).
Test: make checkbuild tests
Bug: None
Change-Id: Iab27dd0d931f723140de242049fa72f3b1ce0fb8
Dan Albert [Wed, 14 Sep 2016 23:08:04 +0000 (16:08 -0700)]
Always link libdl with libc++ for the NDK.
libc++ requires libdl whether it's statically linked or not.
Test: make checkbuild tests
Bug: None
Change-Id: I8abdcfaef779b358196716ab1193cebe278317ac
Chih-hung Hsieh [Wed, 14 Sep 2016 16:54:45 +0000 (16:54 +0000)]
Merge "Emit a table of warnings by project and severity." am:
029ced528b
am:
ecbfa77903
Change-Id: Idb0cceaf1d3476e08879f1cba9986bce6ec3376b
Chih-hung Hsieh [Wed, 14 Sep 2016 16:48:44 +0000 (16:48 +0000)]
Merge "Emit a table of warnings by project and severity."
am:
029ced528b
Change-Id: Ia4c1887c7e82623b9728f409e457d716d561716b
Chih-hung Hsieh [Wed, 14 Sep 2016 16:39:26 +0000 (16:39 +0000)]
Merge "Emit a table of warnings by project and severity."
Dan Willemsen [Tue, 13 Sep 2016 22:48:36 +0000 (22:48 +0000)]
Merge "Fix shared library install dependencies outside of /system" am:
0b3f97b0d6
am:
f9fc0ea6fe
Change-Id: I0b06d2a331cf6788e842d91d8b246df2345f10d8
Dan Willemsen [Tue, 13 Sep 2016 22:45:35 +0000 (22:45 +0000)]
Merge "Fix shared library install dependencies outside of /system"
am:
0b3f97b0d6
Change-Id: Ia2ffd13b26825c495559565f3c4542815956f660
Dan Willemsen [Tue, 13 Sep 2016 22:39:20 +0000 (22:39 +0000)]
Merge "Fix shared library install dependencies outside of /system"
Dan Willemsen [Tue, 13 Sep 2016 20:28:51 +0000 (13:28 -0700)]
Fix shared library install dependencies outside of /system
For properly picking the shared library install dependencies, HOST_OUT
and HOST_CROSS_OUT are necessary so that we don't add a dependency
between Linux and Windows. But for target modules, we must use
TARGET_OUT_ROOT instead of TARGET_OUT, or modules in /data and /vendor
won't have proper install dependencies.
Bug:
31462199
Test: m bionic-unit-tests; manual diff of generated ninja file
Change-Id: I828fa2664613296cc6c431813f5657abffdd2b8f
Ryan Campbell [Tue, 13 Sep 2016 19:58:51 +0000 (19:58 +0000)]
Merge "Implement path-based enabling of code coverage." am:
1e1ecd5d07
am:
6b92bb4ebb
Change-Id: I8d359d0dc1fd72491239152f3c6b852c307ca919