Commit Graph

34022 Commits

Author SHA1 Message Date
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

Change-Id: Ic47af33906d2ead19cc3b6346f1aa55e5de5952d
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

Change-Id: I5ccd6ba60e5e9eb3e0875e99630db583a178a569
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

Change-Id: I488b164ae8c3a93858a293e2a538ff6b8742736c
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

Change-Id: I938ee86611ea8c452c07324e2f3c6a9b0180cb7e
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

Change-Id: I3924b44e75aa0f8f18129212dd80fd843f6a6a47
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.

Change-Id: I3ffcdc604a1cb92c86c574b5cd358d0148430d55
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

Change-Id: Ibd6f3c9a6291c13605613ea8b67662c67a51ede5
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

Change-Id: I50f6cb9d43dec1a508390ddaf22dbc1a0156f405
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

Change-Id: I55c02f7b10bc5a285c841de3a9c20dd5768a5e77
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

Change-Id: Icf01db86b950d2ebd7241448d9cc680e118afc71
2017-02-21 19:00:47 +00:00
Tao Bao 5636426646 Merge "Revert "Build FUTILITY tool from futility-host."" into nyc-dev
am: 683f58096d

Change-Id: Iec1997b1671bacda94206deeff28a8c8c7048d36
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.

Change-Id: Icec9da939a50c794b15ba3f40e8307f8829254c7
2017-02-21 18:44:24 +00:00
Alain Vongsouvanh 5c9f21da04 Merge "releasetools: allow for multiple OEM property values." am: 9a3049d681
am: b98cde50aa

Change-Id: I691ce751f4fc9534f2b6c22f86aa3f16958130eb
2017-02-21 18:32:45 +00:00
Alain Vongsouvanh b98cde50aa Merge "releasetools: allow for multiple OEM property values."
am: 9a3049d681

Change-Id: Icb67fdcf5f81c9169ce7316e3e483a86f884d743
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

Change-Id: I7f43d9d1b89d4da6e1b327b49f5b2344e0480841
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

Change-Id: Ia0ae534b7d027661da21e12ca03eb2e4e178a22e
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

Change-Id: Ib858be8c430acf21d6aa175481ee68bb3e477caa
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

Change-Id: I2fbae1cc97aaff2c2f8e9f876ebac29b40eddcfa
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

Change-Id: I514c69dca1aede0fe047682dab9b11e7263d7634
2017-02-21 17:48:16 +00:00
Tao Bao ebd498acc6 Build FUTILITY tool from futility-host. am: a7726c1e36 am: 7459fbc169
am: 26e8fa493c

Change-Id: Icd2ad9d62bc9e4ad33f053bf30a77e6641bc4f4b
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

Change-Id: I411b26baf0cd7d74ec6c8c80a12f0499d017a360
2017-02-21 17:46:45 +00:00
Tao Bao 26e8fa493c Build FUTILITY tool from futility-host. am: a7726c1e36
am: 7459fbc169

Change-Id: I5807a90dd5b953d0fe735c1263463fcb33cae06f
2017-02-21 17:46:41 +00:00
Tao Bao a9bdf8716f releasetools: Allow using futility-host to sign old TF.zip.
am: 31a0de00a4

Change-Id: I46041e6e5e37c451f8f23dca773850c025aa18b2
2017-02-21 17:45:15 +00:00
Tao Bao 7459fbc169 Build FUTILITY tool from futility-host.
am: a7726c1e36

Change-Id: I681c3ed4de19bd4c2bca398876806e2ef25087c3
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
Paul Duffin f22aca1e47 Filter JUnit and android.test classes from applications using proguard
The new javac/desugar/proguard/dx based toolchain can fail if
there are duplicate classes in the -injars and -libraryjars
passed to proguard. That causes problems for b/30188076 which
is attempting to remove various junit and android.test classes
from the API because it requires the changes to add those
classes statically to applications are submitted simultaneously
with the change to remove the classes from the API which is not
feasible.

This change simply causes Proguard to ignore the classes from
the application JAR so it will always use them from the library.
That allows the changes to be done separately and only requires
that this change is reverted simultaneously with the change to
update the API.

Bug: 30188076
Test: make checkbuild and make -j ANDROID_FORCE_JACK_ENABLED=disabled checkbuild
Change-Id: I6ed6c45a159d6261d90245551aa2913cc82d2e8b
2017-02-21 13:11:13 +00:00
Paul Duffin 750dfa7590 Merge "2nd attempt to remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES" am: 6cf9da761a
am: 4e5d1b0624

Change-Id: Id7a1b8505af5fdf088140036370a22d3eb93c0ab
2017-02-20 12:02:06 +00:00
Paul Duffin 4e5d1b0624 Merge "2nd attempt to remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES"
am: 6cf9da761a

Change-Id: Ie5425a088e63d2b13c1b4e92da2243176ce9706b
2017-02-20 11:58:37 +00:00
Paul Duffin 6cf9da761a Merge "2nd attempt to remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES" 2017-02-20 11:51:01 +00:00
Colin Cross 77b7e12e25 Merge "Revert "Revert "Add soong_javac_filter to all javac commands""" am: 29f3642dd1
am: 58ffd38f97

Change-Id: I0f5155cf5ccb6cf87bde635ec5cdb8648f684986
2017-02-20 07:05:22 +00:00
Colin Cross 58ffd38f97 Merge "Revert "Revert "Add soong_javac_filter to all javac commands"""
am: 29f3642dd1

Change-Id: I1e39a9155fecc6cb0a1031d2b04299fdfdf1442b
2017-02-20 07:01:22 +00:00
Treehugger Robot 29f3642dd1 Merge "Revert "Revert "Add soong_javac_filter to all javac commands""" 2017-02-20 06:56:15 +00:00
Colin Cross 440079b84b Revert "Revert "Add soong_javac_filter to all javac commands""
This reverts commit 52d2253ff9.

Test: pipe the grok build output through soong_javac_filter
Change-Id: I449a61ed2c95b3e1afd51a31a11baab15d97e2f2
2017-02-19 19:56:51 -08:00
Colin Cross ca54c6c24e Merge "Disable building coverage with javac" am: 271b1f6521
am: 2f23c5caf7

Change-Id: I7d97a871042dab43a112f84186f4015b2fe3d6d7
2017-02-19 06:32:23 +00:00
Colin Cross 2f23c5caf7 Merge "Disable building coverage with javac"
am: 271b1f6521

Change-Id: Ie65e362bd9736623dec3041891f060cf56b98895
2017-02-19 06:28:53 +00:00
Treehugger Robot 271b1f6521 Merge "Disable building coverage with javac" 2017-02-19 06:22:26 +00:00
Tao Bao 45d092498a Merge "releasetools: Allow using futility-host to sign old TF.zip." am: 48a3ccbf1b
am: aa778c7af4

Change-Id: I8721aa27232dea6940ef6f55c3fd5806ae8f123b
2017-02-18 23:00:25 +00:00
Tao Bao aa778c7af4 Merge "releasetools: Allow using futility-host to sign old TF.zip."
am: 48a3ccbf1b

Change-Id: I6efee0b3a6c5b4c7d9cf3ca90a0e2e4c39470853
2017-02-18 22:56:56 +00:00
Tao Bao 48a3ccbf1b Merge "releasetools: Allow using futility-host to sign old TF.zip." 2017-02-18 22:53:53 +00:00
Colin Cross efa6ae84ca Revert "Replace hardware features conf file to be emulator specific"
This reverts commit a118a21b00.

Change-Id: I2c4140667a2c00abad3c6337c680542070dd7caa
2017-02-18 20:05:24 +00:00
Colin Cross 25a79dacd9 Disable building coverage with javac
Emma is unable to process framework.jar, and making framework
classes.jar depend on the emma output causes builds to fail when
emma is enabled.  Make classes.jar depend on the jarjar output
instead, bypassing emma for now.

Test: m -j EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true check-public-api
Change-Id: I861282292816e29ca27b67a3eef978d951c1a4dc
2017-02-17 23:47:26 -08:00
Tao Bao 31a0de00a4 releasetools: Allow using futility-host to sign old TF.zip.
Commit e98fb7a8d3 switched to using
futility-host instead of the prebuilt futility. This CL adds support to
handle signing old TF.zip that still says "futility=prebuilt/..." in
META/misc_info.txt.

Bug: 35467608
Test: Generate otatools.zip and sign an old ryu TF.zip.
Change-Id: I48a9cc918c7afce361e1ec9bc4f85f74fa92566e
(cherry picked from commit 4f104d1b94)
2017-02-17 23:36:00 -08:00
Tao Bao a7726c1e36 Build FUTILITY tool from futility-host.
Also pack the tool, vboot_signer.sh script and the test keys into
otatools.zip. This allows signing ryu target without a source repo.

Bug: 35467608
Test: m otatools-package and check the newly included files.
Test: Use otatools.zip to sign a ryu target.
Change-Id: I70f7b359f21a579463d5c7251daac81a97e338cc
(cherry picked from commit e98fb7a8d3)
2017-02-17 23:35:40 -08:00
Tao Bao 4f104d1b94 releasetools: Allow using futility-host to sign old TF.zip.
Commit e98fb7a8d3 switched to using
futility-host instead of the prebuilt futility. This CL adds support to
handle signing old TF.zip that still says "futility=prebuilt/..." in
META/misc_info.txt.

Bug: 35467608
Test: Generate otatools.zip and sign an old ryu TF.zip.
Change-Id: I48a9cc918c7afce361e1ec9bc4f85f74fa92566e
2017-02-17 23:27:44 -08:00