Paul Duffin
6c99b4bc49
Merge "Filter JUnit and android.test classes from applications using proguard" am: 38a231d6c3
...
am: 3e93d553ec
2017-02-22 12:22:54 +00:00
Paul Duffin
3e93d553ec
Merge "Filter JUnit and android.test classes from applications using proguard"
...
am: 38a231d6c3
2017-02-22 12:20:54 +00:00
Paul Duffin
38a231d6c3
Merge "Filter JUnit and android.test classes from applications using proguard"
2017-02-22 12:15:27 +00:00
Colin Cross
901057d95a
Merge "Use ifndef or ifeq () instead of ifeq """ am: 1948f64dd5
...
am: f78a2f821c
2017-02-22 04:31:59 +00:00
Colin Cross
f78a2f821c
Merge "Use ifndef or ifeq () instead of ifeq """
...
am: 1948f64dd5
2017-02-22 04:30:00 +00:00
Treehugger Robot
1948f64dd5
Merge "Use ifndef or ifeq () instead of ifeq """
2017-02-22 04:25:49 +00:00
Dan Willemsen
d04de52560
Merge "Wait for children to exit in makeparallel" am: 9b1a185029
...
am: c08e57ce4d
2017-02-22 03:33:27 +00:00
Dan Willemsen
c08e57ce4d
Merge "Wait for children to exit in makeparallel"
...
am: 9b1a185029
2017-02-22 03:31:26 +00:00
Treehugger Robot
9b1a185029
Merge "Wait for children to exit in makeparallel"
2017-02-22 03:27:21 +00:00
Dan Willemsen
f0e2986cbf
Wait for children to exit in makeparallel
...
This is a partial revert to the last makeparallel change, since now we
were being killed by the signal before waiting for our child to exit. So
instead of not installing the handlers, only pass the signal along if
it's a SIGTERM.
Bug: 35214134
Test: Ensure that we're still only getting one signal for SIGINT
Test: Ctrl-C, ensure that all the soong_ui lines are before the make
error line.
Change-Id: I26fff9483a3abfd79ceb5a9ea47e3f7572d9e923
2017-02-21 17:53:35 -08:00
Colin Cross
63fe36abbe
Use ifndef or ifeq () instead of ifeq ""
...
ifeq with quotes is technically correct make syntax, but rarely used.
Replace it with the simpler ifndef when comparing against empty, or
with parenthesis for consistency.
Test: builds
Change-Id: Idcbe0586c4626c67d560694596b0bd9f5f93484a
2017-02-21 17:29:10 -08:00
Dan Willemsen
3c7e341f57
Merge "Stop double-printing config" am: a7d4e0cd73
...
am: 283ed982cd
2017-02-22 01:00:47 +00:00
Dan Willemsen
283ed982cd
Merge "Stop double-printing config"
...
am: a7d4e0cd73
2017-02-22 00:58:46 +00:00
Treehugger Robot
a7d4e0cd73
Merge "Stop double-printing config"
2017-02-22 00:54:03 +00:00
Colin Cross
4d353da971
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 557ce055e7
...
am: 9a02b183fd
2017-02-21 23:35:52 +00:00
Colin Cross
9a02b183fd
Merge "Revert "Replace hardware features conf file to be emulator specific""
...
am: 557ce055e7
2017-02-21 23:31:31 +00:00
Dan Willemsen
06fbe5bec5
Merge "Prevent duplicate signals from makeparallel" am: 70aac88a61
...
am: 52ac801739
2017-02-21 23:29:40 +00:00
Dan Willemsen
52ac801739
Merge "Prevent duplicate signals from makeparallel"
...
am: 70aac88a61
2017-02-21 23:27:14 +00:00
Colin Cross
557ce055e7
Merge "Revert "Replace hardware features conf file to be emulator specific""
2017-02-21 23:25:07 +00:00
Treehugger Robot
70aac88a61
Merge "Prevent duplicate signals from makeparallel"
2017-02-21 23:22:32 +00:00
Dan Willemsen
0d25529b4c
Stop double-printing config
...
Don't print the config in Kati when we've already printed it in soong_ui
or the make wrapper.
Test: m -j
Test: USE_SOONG_UI=true m -j
Change-Id: Ic6dce0ab29d584d85c6642c597f6e9dcd6ba9dca
2017-02-21 15:12:15 -08:00
Dan Willemsen
c6a900bee1
Prevent duplicate signals from makeparallel
...
As part of the soong_ui effort, we noticed that we'd sometimes see
multiple SIGINTs from a single ctrl-c from a user. ctrl-c sends a SIGINT
to the entire process group, so make, makeparallel, soong_ui, and all of
its children would get a signal. Since makeparallel was passing it along
to it's child, soong_ui would get two signals.
So instead, follow what Make does and only pass along SIGTERM. Assume
that all other signals went to the entire process group.
Bug: 35214134
Test: Send SIGINT to process group, check in makeparallel's child for
more than one signal received.
Change-Id: I5b2a77ad0fcebbaa5087439948e71bf3b541061a
2017-02-21 13:50:12 -08:00
Tao Bao
4f0a147b69
Merge "Revert "releasetools: Allow using futility-host to sign old TF.zip."" into nyc-dev am: b0df1ef7ac am: 983c979c25 am: bd6d03ab18 am: e64f52ebcd
...
am: 55f185e0a4
2017-02-21 20:39:56 +00:00
Tao Bao
55f185e0a4
Merge "Revert "releasetools: Allow using futility-host to sign old TF.zip."" into nyc-dev am: b0df1ef7ac am: 983c979c25 am: bd6d03ab18
...
am: e64f52ebcd
2017-02-21 20:37:24 +00:00
Tao Bao
e64f52ebcd
Merge "Revert "releasetools: Allow using futility-host to sign old TF.zip."" into nyc-dev am: b0df1ef7ac am: 983c979c25
...
am: bd6d03ab18
2017-02-21 20:35:25 +00:00
Tao Bao
bd6d03ab18
Merge "Revert "releasetools: Allow using futility-host to sign old TF.zip."" into nyc-dev am: b0df1ef7ac
...
am: 983c979c25
2017-02-21 20:33:25 +00:00
Tao Bao
983c979c25
Merge "Revert "releasetools: Allow using futility-host to sign old TF.zip."" into nyc-dev
...
am: b0df1ef7ac
2017-02-21 20:31:25 +00:00
Tao Bao
b0df1ef7ac
Merge "Revert "releasetools: Allow using futility-host to sign old TF.zip."" into nyc-dev
2017-02-21 20:29:38 +00:00
Tao Bao
d6145b6a16
Revert "releasetools: Allow using futility-host to sign old TF.zip."
...
Broke ryu targets.
This reverts commit 31a0de00a4
2017-02-21 20:27:27 +00:00
Tao Bao
cba9d53c78
Merge "Revert "Build FUTILITY tool from futility-host."" into nyc-dev am: 683f58096d am: 5636426646 am: dcaa3eb7dd am: 9c1f17ba6f
...
am: 7024d9c484
2017-02-21 19:07:18 +00:00
Tao Bao
7024d9c484
Merge "Revert "Build FUTILITY tool from futility-host."" into nyc-dev am: 683f58096d am: 5636426646 am: dcaa3eb7dd
...
am: 9c1f17ba6f
2017-02-21 19:04:47 +00:00
Tao Bao
9c1f17ba6f
Merge "Revert "Build FUTILITY tool from futility-host."" into nyc-dev am: 683f58096d am: 5636426646
...
am: dcaa3eb7dd
2017-02-21 19:02:47 +00:00
Tao Bao
dcaa3eb7dd
Merge "Revert "Build FUTILITY tool from futility-host."" into nyc-dev am: 683f58096d
...
am: 5636426646
2017-02-21 19:00:47 +00:00
Tao Bao
5636426646
Merge "Revert "Build FUTILITY tool from futility-host."" into nyc-dev
...
am: 683f58096d
2017-02-21 18:58:47 +00:00
Tao Bao
683f58096d
Merge "Revert "Build FUTILITY tool from futility-host."" into nyc-dev
2017-02-21 18:55:34 +00:00
Tao Bao
b9186f2b52
Revert "Build FUTILITY tool from futility-host."
...
Broke ryu targets.
This reverts commit a7726c1e36
2017-02-21 18:44:24 +00:00
Alain Vongsouvanh
5c9f21da04
Merge "releasetools: allow for multiple OEM property values." am: 9a3049d681
...
am: b98cde50aa
2017-02-21 18:32:45 +00:00
Alain Vongsouvanh
b98cde50aa
Merge "releasetools: allow for multiple OEM property values."
...
am: 9a3049d681
2017-02-21 18:30:15 +00:00
Treehugger Robot
9a3049d681
Merge "releasetools: allow for multiple OEM property values."
2017-02-21 18:23:15 +00:00
Tao Bao
e2d1faf4a3
releasetools: Allow using futility-host to sign old TF.zip. am: 31a0de00a4 am: a9bdf8716f am: ae2f5abf06 am: 79d719b313
...
am: ea88a3f3fa
2017-02-21 17:52:17 +00:00
Tao Bao
1b2311250e
Build FUTILITY tool from futility-host. am: a7726c1e36 am: 7459fbc169 am: 26e8fa493c am: ebd498acc6
...
am: e2cc7e5d4c
2017-02-21 17:52:12 +00:00
Tao Bao
ea88a3f3fa
releasetools: Allow using futility-host to sign old TF.zip. am: 31a0de00a4 am: a9bdf8716f am: ae2f5abf06
...
am: 79d719b313
2017-02-21 17:50:18 +00:00
Tao Bao
e2cc7e5d4c
Build FUTILITY tool from futility-host. am: a7726c1e36 am: 7459fbc169 am: 26e8fa493c
...
am: ebd498acc6
2017-02-21 17:50:12 +00:00
Tao Bao
79d719b313
releasetools: Allow using futility-host to sign old TF.zip. am: 31a0de00a4 am: a9bdf8716f
...
am: ae2f5abf06
2017-02-21 17:48:16 +00:00
Tao Bao
ebd498acc6
Build FUTILITY tool from futility-host. am: a7726c1e36 am: 7459fbc169
...
am: 26e8fa493c
2017-02-21 17:48:10 +00:00
Tao Bao
ae2f5abf06
releasetools: Allow using futility-host to sign old TF.zip. am: 31a0de00a4
...
am: a9bdf8716f
2017-02-21 17:46:45 +00:00
Tao Bao
26e8fa493c
Build FUTILITY tool from futility-host. am: a7726c1e36
...
am: 7459fbc169
2017-02-21 17:46:41 +00:00
Tao Bao
a9bdf8716f
releasetools: Allow using futility-host to sign old TF.zip.
...
am: 31a0de00a4
2017-02-21 17:45:15 +00:00
Tao Bao
7459fbc169
Build FUTILITY tool from futility-host.
...
am: a7726c1e36
2017-02-21 17:45:10 +00:00
Alain Vongsouvanh
7f804ba71f
releasetools: allow for multiple OEM property values.
...
This CL changes the --oem_settings flag to allow a comma seperated list of
property files. All property values will be used when asserting properties such
as ro.product.name.
For example, if two property files are provided with ro.product.name values of
"sprout" and "sprout_a", the resulting otapackage will check that the device's
ro.product.name property matches at least one of them.
Bug: 34191373
Test: manual
Change-Id: I954673511be8f0929982235cc9cbfbd85a9ee1f4
2017-02-21 16:09:34 +00:00
