Commit Graph

34034 Commits

Author SHA1 Message Date
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
Steven Moreland 51108a3e6d Merge "embedded.mk: allocator service" am: 0aef0b59af
am: dc7d29ed86

Change-Id: If5d9b58c346c550d1feff1f119096ba66ccdc767
2017-02-18 01:54:57 +00: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 d186e1db6f Merge "Build all the way to classes.dex for checkbuild" am: 41c7d8423b
am: 9003bc7d4b

Change-Id: I2476afff1972e255525c6dd2d32874d2aaae9926
2017-02-18 01:39:51 +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 d48f9252d5 Merge "Add a desugar step between javac and proguard" am: 9e92c2fd18
am: e4381dcac2

Change-Id: I5c72358097629e3ffe597c517e86a38ffbf51d82
2017-02-18 01:15:21 +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
Tao Bao f0e03f325f Merge "Build FUTILITY tool from futility-host." am: c53607d9cc
am: 6498b2efbf

Change-Id: I72e7d16465a7975d0ad57a4258c23da507fcb594
2017-02-18 01:10:49 +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 d20c5e2a81 Merge "Remove unused zipalign macros" am: 56183c2ee2
am: e4a0dd15cc

Change-Id: Id086073bc8aaf01477ed8c360813929459110b40
2017-02-18 00:20:45 +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 4a78c9e50f Merge "Add Header Library support to Make" am: 4f794fdd50
am: ea2687fab6

Change-Id: I7b3ba92b8f329df796194fe4f608dab6b935c0bd
2017-02-17 23:57:16 +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 7072f50067 Merge "Replace hardware features conf file to be emulator specific" am: afd7f4f453
am: 7be6f4c9fd

Change-Id: Id8e3da9c86583ab5f961fd70d6999038b54a72b9
2017-02-17 23:31:24 +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 4db7d2d72b Merge "Revert "Add soong_javac_filter to all javac commands"" am: 6dd4debe74
am: cb78c50239

Change-Id: I2a85d1855e4a013e6438a0b2ce5b0cf29aa6c3d6
2017-02-17 23:02:10 +00: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 7d8a028cd3 Merge changes I7e8fcd2e,Ie12d743c am: 547f7393d7
am: 8283b186be

Change-Id: I6404f454941195d60cbd222adb3e6912376966c7
2017-02-17 22:36:36 +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