Commit Graph

33780 Commits

Author SHA1 Message Date
Dan Willemsen 52ac801739 Merge "Prevent duplicate signals from makeparallel"
am: 70aac88a61

Change-Id: Iade687bc2bfe56a357b0c8215b5f03cfdec2df9d
2017-02-21 23:27:14 +00:00
Treehugger Robot 70aac88a61 Merge "Prevent duplicate signals from makeparallel" 2017-02-21 23:22:32 +00: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
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
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 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 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 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 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 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 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
Steven Moreland dc7d29ed86 Merge "embedded.mk: allocator service"
am: 0aef0b59af

Change-Id: I1e76d88e7d79082006bc4671087987e7d0df2966
2017-02-18 01:52:57 +00:00
Treehugger Robot 0aef0b59af Merge "embedded.mk: allocator service" 2017-02-18 01:49:07 +00:00
Colin Cross 9003bc7d4b Merge "Build all the way to classes.dex for checkbuild"
am: 41c7d8423b

Change-Id: I11b0cea9ccd40b29e6dc1338a0d29194df1d2579
2017-02-18 01:38:21 +00:00
Treehugger Robot 41c7d8423b Merge "Build all the way to classes.dex for checkbuild" 2017-02-18 01:35:40 +00:00
Colin Cross e4381dcac2 Merge "Add a desugar step between javac and proguard"
am: 9e92c2fd18

Change-Id: I1bcbc1a9d98cad43b5f67f54b8e09de8bf8eb67b
2017-02-18 01:13:19 +00:00
Colin Cross 9e92c2fd18 Merge "Add a desugar step between javac and proguard" 2017-02-18 01:10:08 +00:00
Tao Bao 6498b2efbf Merge "Build FUTILITY tool from futility-host."
am: c53607d9cc

Change-Id: Ieabf4a622916a7ed18b0adac4f5091dcea96d659
2017-02-18 01:09:48 +00:00
Tao Bao c53607d9cc Merge "Build FUTILITY tool from futility-host." 2017-02-18 01:04:31 +00:00
Dan Willemsen e4a0dd15cc Merge "Remove unused zipalign macros"
am: 56183c2ee2

Change-Id: I7c743f2b694652af35f74b0e61c3dfe290812b18
2017-02-18 00:18:45 +00:00
Treehugger Robot 56183c2ee2 Merge "Remove unused zipalign macros" 2017-02-18 00:12:42 +00:00
Dan Willemsen ea2687fab6 Merge "Add Header Library support to Make"
am: 4f794fdd50

Change-Id: I44b0f0fe5c0f4d65bf205165e4ec05403f738066
2017-02-17 23:55:16 +00:00
Dan Willemsen 4f794fdd50 Merge "Add Header Library support to Make" 2017-02-17 23:50:41 +00:00
Pulkit Bhuwalka 7be6f4c9fd Merge "Replace hardware features conf file to be emulator specific"
am: afd7f4f453

Change-Id: I52b0bc325e8fb8d72e40d947cd7e683ab415d10c
2017-02-17 23:28:19 +00:00
Treehugger Robot afd7f4f453 Merge "Replace hardware features conf file to be emulator specific" 2017-02-17 23:20:25 +00:00
Colin Cross e1159f5b39 Build all the way to classes.dex for checkbuild
Test: m -j checkbuild
Change-Id: Ie1b7be01c9bbcf1a32399f19d050a93410bdb42b
2017-02-17 15:03:07 -08:00
Colin Cross eac5ce4e97 Add a desugar step between javac and proguard
This enables support for lambdas by passing class files through the
desugar tool.

Test: m -j checkbuild tests cts
Change-Id: I14ec152355243fd67fe2f107ccbe67a1b4e7e262
2017-02-17 15:03:06 -08:00
Colin Cross cb78c50239 Merge "Revert "Add soong_javac_filter to all javac commands""
am: 6dd4debe74

Change-Id: I31aedc360439bd26f205d6db1502297d7ca5b63a
2017-02-17 23:00:09 +00:00
Colin Cross 6dd4debe74 Merge "Revert "Add soong_javac_filter to all javac commands"" 2017-02-17 22:54:06 +00:00
Colin Cross 52d2253ff9 Revert "Add soong_javac_filter to all javac commands"
This reverts commit a341bf0f86.

Breaks grok builds that replace javac with another tool:
reading standard input: bufio.Scanner: token too long

Change-Id: I825587c465b05c1fbddb7794dc1c84f5f2c883d1
2017-02-17 22:53:42 +00:00
Colin Cross 8283b186be Merge changes I7e8fcd2e,Ie12d743c
am: 547f7393d7

Change-Id: Id9cd5b894a599ca660363234863fdfc6602575d2
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
Tao Bao e98fb7a8d3 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
2017-02-17 14:16:46 -08:00
Pulkit Bhuwalka a118a21b00 Replace hardware features conf file to be emulator specific
full_base_telephoney.mk file gets used only for emulators which should
have bluetooth disabled. Using the default handheld_core_hardware.xml
file has bluetooth enabled. We should use the generic
handheld_core_hardware.xml file for emulators which has bluetooth
disabled.

Its presence causes problems upstream in SystemServer when
BluetoothService starts and requires an extra emulator config change
which should not be there.

Bug: 35361545
Test: Verified by launching Android Emulator. It works fine and does not
start bluetooth.

Change-Id: I484c3d5867f46853fb49f28422dd72ab362ed768
2017-02-17 13:46:01 -08:00
Steven Moreland f086747106 embedded.mk: allocator service
We are splitting android.hidl.memory into android.hidl.allocator and
android.hidl.memory to reflect the fact that we have two separate
interfaces which are served over different transports.

Bug: 35327976
Test: hidl_test, device boots with allocator

Merged-In: I36b1554d20f89ecd60a836c04f788ac83e0a1f5c
Change-Id: I36b1554d20f89ecd60a836c04f788ac83e0a1f5c
2017-02-17 20:47:16 +00:00
Dan Willemsen 85acdfac58 Remove unused zipalign macros
Test: codesearch
Test: build-marlin.ninja is identical before/after (in internal master)
Change-Id: I1c5c39cabcc166b8e8608ace3290b7027d258624
2017-02-17 10:44:30 -08:00
Narayan Kamath 6e5855f9ed Merge "zipalign: remove support for adding members from gzip sources." am: 96a4bdd9a6 am: 080f68acf5
am: 8778583000

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

Change-Id: I8c8eb0405255df42a302406c68b3d702b85e0ead
2017-02-17 14:19:51 +00:00
Narayan Kamath 080f68acf5 Merge "zipalign: remove support for adding members from gzip sources."
am: 96a4bdd9a6

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

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

Change-Id: I9fc141840a2b186b252bd2764344a9e791690ef6
2017-02-17 03:46:08 +00:00
Colin Cross 4cfa9fcd48 Merge "Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION"
am: 738d2de20b

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