Commit Graph

11757 Commits

Author SHA1 Message Date
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
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
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
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
d3183bdf40 Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION
Create a default list of minor versions (v, vDR1, vDR2, vMR1, vMR2)
for O and P, and propagate TARGET_PLATFORM_VERSION to IS_AT_LEAST_*
variables.

Test: manual
Bug: 34610721
Change-Id: I575caa099d85ee6fbc79538e67dc8d621e81790f
2017-02-16 17:08:03 -08:00
Colin Cross
a341bf0f86 Add soong_javac_filter to all javac commands
soong_javac_filter colorizes javac output, and hides noisy messages.

Test: builds
Change-Id: I7e8fcd2e4e1ed3ff530a8ccfe931ceb7e411e0ad
2017-02-16 14:08:45 -08:00
Colin Cross
79e2f73b6c Re-enable dx support
This is a partial revert of commits:
858657366f Remove support of disabling Jack.
3ae7861252 Remove javac support in host dex rules.
22313f2b2a Remove rules for building dex with dx

Test: builds
Change-Id: Ie12d743cbe978bdeb030910848b67f5945a4fec8
2017-02-16 14:08:45 -08:00
Dan Willemsen
8dae49c5e1 Add Header Library support to Make
We currently use static libraries without any source files to represent
header libraries, but Soong actually has cc_library_headers. So to
export those in a separate namespace from static libraries, implement
them in Make as well.

This also adds a nice pretty-warning / pretty-error macro that can be
used to print out standard warning messages pointing to the real source
file having the problem.

Test: Use a header library exported by Soong in a Make module
Change-Id: I3486539e247524cb82a20620745fc7be03014e14
2017-02-15 16:04:49 -08:00
Vishwath Mohan
7832d8737d Merge "Blacklist code for CFI." am: 5f50896a7f am: f1e39159c8
am: cdf79d7298

Change-Id: I5ada41559bca3b98a48e6fb29c535e445f7ef7fb
2017-02-15 23:41:21 +00:00
Vishwath Mohan
cdf79d7298 Merge "Blacklist code for CFI." am: 5f50896a7f
am: f1e39159c8

Change-Id: I54c3d78d16069abce64f007942fda7e28f703303
2017-02-15 23:37:48 +00:00
Treehugger Robot
5f50896a7f Merge "Blacklist code for CFI." 2017-02-15 22:52:46 +00:00
Vishwath Mohan
5b69c06f1f Blacklist code for CFI.
Adds the -fsanitize-blacklist option for CFI, using the built in
blacklist at external/compiler-rt/lib/cfi/cfi_blacklist.txt.

Also refactors the CFI cflags and ldflags into ../soong/cc/makevars.go
to ensure they're consistent across Soong and make projects.

Bug: 30227045
Test: ENABLE_CFI=true m -j40 builds and boots.
Test: The blacklist prevents runtime errors that otherwise occur.
Change-Id: I0c2801ed459a3b9adeb37daff3ca212564801259
2017-02-15 12:48:05 -08:00
Dan Willemsen
72cdc68467 Merge "Fix init rc installation in vendor when LOCAL_MODULE_PATH is set" am: 74dcb9feb3 am: 8d0fda5f9e
am: 5721a9140c

Change-Id: Iae0fde3dfefcac41e482ec880bf9296a48f26174
2017-02-15 00:59:15 +00:00
Dan Willemsen
5721a9140c Merge "Fix init rc installation in vendor when LOCAL_MODULE_PATH is set" am: 74dcb9feb3
am: 8d0fda5f9e

Change-Id: Idc39d13b21c677258d24f1e93474f65438a4532a
2017-02-15 00:56:43 +00:00
Treehugger Robot
74dcb9feb3 Merge "Fix init rc installation in vendor when LOCAL_MODULE_PATH is set" 2017-02-15 00:45:19 +00:00
Dan Willemsen
ce18a0d8f4 Merge "Support Soong native coverage" am: c9fa07c958 am: 0c2bd30961
am: c9f5ca3969

Change-Id: Iada65b8bfb9ca28bada7fb4566f8a09a06a99fb8
2017-02-15 00:41:45 +00:00
Dan Willemsen
c9f5ca3969 Merge "Support Soong native coverage" am: c9fa07c958
am: 0c2bd30961

Change-Id: I68a695f1524331d6516ce16cad8ade3162072336
2017-02-15 00:39:13 +00:00
Dan Willemsen
c9fa07c958 Merge "Support Soong native coverage" 2017-02-15 00:32:16 +00:00
Dan Willemsen
054ac67c5b Merge "Improve installclean to catch more installed files" am: 22b55e1c54 am: af402e14b8
am: 81d2e3ce1f

Change-Id: Ic6d394829fe3ae6e23d759c52e748ffc9f127099
2017-02-14 02:16:44 +00:00
Dan Willemsen
81d2e3ce1f Merge "Improve installclean to catch more installed files" am: 22b55e1c54
am: af402e14b8

Change-Id: I03e4fe40525e320fad7b1e0da08b1351e85f4dd2
2017-02-14 02:14:15 +00:00
Treehugger Robot
22b55e1c54 Merge "Improve installclean to catch more installed files" 2017-02-14 02:06:02 +00:00
Adam Seaton
c54e7f5658 Update Security String to 2017-04-05 on nyc-dev am: 8ee3a4cef1 am: e69e40cc34 am: 9cff197d92 am: af59a1c806
am: 61a00ef2ba

Change-Id: If80382b4934a1828fa4738a21a006012cfa3d7bf
2017-02-13 23:26:43 +00:00
Adam Seaton
8ddb562911 Update Security String to 2017-04-01 on nyc-dev am: 93c1a722c2 am: b1865c4cac am: 4526457528 am: 03dc9a951a
am: 570e257352

Change-Id: I443c49a8d536c5bfa21f53cabb7687adc2778ef6
2017-02-13 23:26:37 +00:00
Adam Seaton
61a00ef2ba Update Security String to 2017-04-05 on nyc-dev am: 8ee3a4cef1 am: e69e40cc34 am: 9cff197d92
am: af59a1c806

Change-Id: Ibae45eca09589a4048389541c121c827b9292cd9
2017-02-13 23:24:44 +00:00
Adam Seaton
570e257352 Update Security String to 2017-04-01 on nyc-dev am: 93c1a722c2 am: b1865c4cac am: 4526457528
am: 03dc9a951a

Change-Id: Ic810aa498e9ebf8cf8224c9abfbbc8e11de863a5
2017-02-13 23:24:37 +00:00
Adam Seaton
af59a1c806 Update Security String to 2017-04-05 on nyc-dev am: 8ee3a4cef1 am: e69e40cc34
am: 9cff197d92

Change-Id: I3d8e3b153f3a693da496429fad538a1fda870f35
2017-02-13 23:21:42 +00:00
Adam Seaton
03dc9a951a Update Security String to 2017-04-01 on nyc-dev am: 93c1a722c2 am: b1865c4cac
am: 4526457528

Change-Id: I1ca1d7d860ae1a360cb04074c973931f1290dc9f
2017-02-13 23:21:36 +00:00
Adam Seaton
9cff197d92 Update Security String to 2017-04-05 on nyc-dev am: 8ee3a4cef1
am: e69e40cc34

Change-Id: I7a30fc2fe048aa1e6da8c7ea808961b5437e713d
2017-02-13 23:18:42 +00:00
Adam Seaton
4526457528 Update Security String to 2017-04-01 on nyc-dev am: 93c1a722c2
am: b1865c4cac

Change-Id: I20cd2ed43edee894f4e1e183628392b54c2c9478
2017-02-13 23:18:36 +00:00
Adam Seaton
e69e40cc34 Update Security String to 2017-04-05 on nyc-dev
am: 8ee3a4cef1

Change-Id: I4f7853e8ce785d41b5f2cd4e67458707e100f056
2017-02-13 23:16:13 +00:00
Adam Seaton
b1865c4cac Update Security String to 2017-04-01 on nyc-dev
am: 93c1a722c2

Change-Id: I76d811946e6f9c7bee897a8bd4e8c49e465dd0c1
2017-02-13 23:16:07 +00:00
Colin Cross
762c8f0ba3 Merge "Don't build tests in normal builds" am: 4bf332a56b am: d364511ce7
am: 3ad23fd09e

Change-Id: I31a0077f6972a0b29638fe0c3ba5c0afddcaee75
2017-02-13 22:48:35 +00:00
Colin Cross
3ad23fd09e Merge "Don't build tests in normal builds" am: 4bf332a56b
am: d364511ce7

Change-Id: I2c14f111bcd2a1425c8bdb92e974e2c4af0ea12c
2017-02-13 22:46:05 +00:00