Commit Graph

3527 Commits

Author SHA1 Message Date
Roland Levillain
525d8dec66 Merge "Handle test_per_src test variations as dependencies of APEX modules." 2019-07-22 09:38:53 +00:00
Roland Levillain
0934737003 Merge "Create an extra variation in test_per_src mutator collecting all outputs." 2019-07-22 09:37:31 +00:00
Dan Albert
55a18ba71a Remove asanLibs.
We already link the shared prebuilt from the toolchain. This is
redundant and the wrong version.

Test: make checkbuild
Bug: http://b/74067984
Change-Id: I4b5d23514158eebfb4eea2aa6761e076131c3224
2019-07-19 12:53:27 -07:00
Paul Duffin
21aa3c63ad Merge "Add header_libs to cc_object" am: 60c0cd9a5f am: 318c4dc2c9 am: 20ec55256a
am: 84342249cf

Change-Id: I07b66f261b39b019625f25500d2a3d04f7793cbc
2019-07-19 12:00:10 -07:00
Paul Duffin
318c4dc2c9 Merge "Add header_libs to cc_object"
am: 60c0cd9a5f

Change-Id: I089f2b22d87021ad066d67fcc7e0f23d923a388a
2019-07-19 11:34:40 -07:00
Paul Duffin
60c0cd9a5f Merge "Add header_libs to cc_object" 2019-07-19 18:13:44 +00:00
Roland Levillain
9b5fde9ca4 Handle test_per_src test variations as dependencies of APEX modules.
If a test module with a `test_per_src` property set to `true` is
included in an APEX module, add all the variants for mutator
`test_per_src` as dependencies of the APEX module (not just the
first one).

This is done by adding variation "" of mutator `test_per_src` when
adding a test dependency to an APEX module, which creates an indirect
dependency of the APEX module on all the `test_per_src` variants of
the test module. When generating outputs for the APEX bundle, fetch
and include the set of test outputs from the "" variant.

Test: m (`apex/apex_test.go` amended)
Bug: 129534335
Change-Id: I1c99855971a8a9b2fc5b964a420e882b6791d4e6
2019-07-19 14:15:06 +01:00
Roland Levillain
f2fad97158 Create an extra variation in test_per_src mutator collecting all outputs.
Have `cc.testPerSrcMutator` create an additional variation named "",
having no sources (and generating no output file), but depending on
all other `test_per_src` variations and collecting their output files
in a new field named `cc.Module.testPerSrcOutputFiles`. This is useful
in the case where a module depends on all the `test_per_src`
variations of a test module.

Test: m
Bug: 129534335
Change-Id: I905decc0b9417f47cee9113466677d3bb61ad7b6
2019-07-19 14:15:06 +01:00
Jiyong Park
ca2d13d759 filegroup.path is used to specify the include path for aidl files am: 2907459e43 am: f35b561d95 am: 49d84b4e64
am: 172fa4215c

Change-Id: I3921e2fa77bda63e8a9921910823c20e7e4f83d3
2019-07-19 05:45:29 -07:00
Colin Cross
6e96f22642 Disable cc_fuzz darwin host modules am: eec9b286b0 am: 0ba21628ab am: 6961c6631c
am: 5ee4d32638

Change-Id: I47038df49a112bee5fcb0166af727fba777c01a1
2019-07-19 05:13:03 -07:00
Jiyong Park
f35b561d95 filegroup.path is used to specify the include path for aidl files
am: 2907459e43

Change-Id: Ibf604d664111401d4bcca20db20c754c6845f05a
2019-07-19 04:51:18 -07:00
Colin Cross
0ba21628ab Disable cc_fuzz darwin host modules
am: eec9b286b0

Change-Id: I38e44d1a557c59ed4ab7bf812979e94a3b37b56a
2019-07-19 04:50:50 -07:00
Treehugger Robot
b1469d53e7 Merge changes from topic "docs_circular_dep"
* changes:
  aidl include paths are exported to droiddoc
  filegroup.path is used to specify the include path for aidl files
2019-07-19 11:28:16 +00:00
Jiyong Park
2907459e43 filegroup.path is used to specify the include path for aidl files
filegroup {
    name: "foo",
    srcs: ["srcs/aidl/com/android/**/*.aidl"],
    path: "srcs/aidl",
}

cc_library { // or java_library, etc.
    name: "bar",
    srcs: [":foo"],
}

automatically adds "-Ipath/to/foo/srcs/aidl" when compiling the aidl
files from foo for bar. This allows us to omit aidl include path
when using sources in other places via file group.

Bug: 135922046
Test: m (unit tests added)
Change-Id: I9b42f316f2858fb6da72c2f58a314f391416e809
2019-07-19 11:31:31 +09:00
Colin Cross
eec9b286b0 Disable cc_fuzz darwin host modules
The fuzzer runtime is not present for darwin host modules, disable
cc_fuzz modules when targeting darwin.

Test: m on darwin
Change-Id: I9da319e00e36c3e0a5912329de7890a6409f1a55
2019-07-18 16:23:45 -07:00
Mitch Phillips
2e2a29bdc4 Merge "Add the cc_fuzz target." am: 178f8fb732 am: d47d87d7d0 am: e78be10d8a
am: b0437b89f0

Change-Id: Ib2ead0703c888b5b6fa05fa550b989872ec131a8
2019-07-18 14:35:45 -07:00
Mitch Phillips
d47d87d7d0 Merge "Add the cc_fuzz target."
am: 178f8fb732

Change-Id: I4a1a2f68054dde52442798f9fa08e04536a02cc7
2019-07-18 14:07:12 -07:00
Treehugger Robot
178f8fb732 Merge "Add the cc_fuzz target." 2019-07-18 20:38:33 +00:00
Christopher Ferris
4ec6208b1e Merge "Add liblog as shared dependency for isolated tests." am: cc9a246063 am: 6373d0fd39 am: 471b91fc72
am: 5575a7f6d6

Change-Id: I027bd1c26d9da25b28c916a6a41c1b594a43cf4e
2019-07-18 13:29:47 -07:00
Christopher Ferris
6373d0fd39 Merge "Add liblog as shared dependency for isolated tests."
am: cc9a246063

Change-Id: Ib2d2dd62c148ba08e2c64d21b53a8f489b5a8e59
2019-07-18 12:21:18 -07:00
Christopher Ferris
cc9a246063 Merge "Add liblog as shared dependency for isolated tests." 2019-07-18 19:00:46 +00:00
Paul Duffin
a37832a3c3 Add header_libs to cc_object
Needed to allow removal of the include_dirs property from the
asm_defines.s module. Also, adds ObjectLinkerProperties to cc_defaults
so that default settings of header_libs are correctly prepended to the
properties in cc_object.

Bug: 35624006
Test: m cpp-define-generator-asm-support - compare output before and after change
Change-Id: Ib95d79c5eba4a89b7ab04b6c62090b720ec7e9fe
2019-07-18 15:58:58 +01:00
Jeff Vander Stoep
8b2bd15423 Renderscript: rename .rs extension to .rscript
Reserve .rs extension for Rust.

Bug: 137365032
Test: make checkbuild
Test: cd frameworks/compile/slang/tests
    ./slang_tests.py
    Test: atest CtsRenderscriptTestCases
    Test: CtsRsCppTestCases

Exempt-From-Owner-Approval: Clean CP
Change-Id: I0458009b8bb64a012fece364835d5b78d52e15e9
Merged-In: I0458009b8bb64a012fece364835d5b78d52e15e9
(cherry picked from commit 41ce1c0d82)
(cherry picked from commit a50b16974a)
2019-07-18 04:02:38 +00:00
Jeffrey Vander Stoep
38aaf75e44 Merge "Renderscript: rename .rs extension to .rscript" 2019-07-18 02:02:00 +00:00
Christopher Ferris
34cbba6e16 Add liblog as shared dependency for isolated tests.
If liblog is a static library, then unit tests cannot properly
override log functions.

Test: Build isolated tests and run them.
Change-Id: Id202c5950518408ce66ceea70988dde8080fd1f9
2019-07-17 15:46:29 -07:00
Jeff Vander Stoep
d612627169 Renderscript: rename .rs extension to .rscript
Reserve .rs extension for Rust.

Bug: 137365032
Test: make checkbuild
Test: cd frameworks/compile/slang/tests
    ./slang_tests.py
    Test: atest CtsRenderscriptTestCases
    Test: CtsRsCppTestCases

Change-Id: I0458009b8bb64a012fece364835d5b78d52e15e9
Merged-In: I0458009b8bb64a012fece364835d5b78d52e15e9
2019-07-17 18:57:32 +00:00
TreeHugger Robot
f0976d6530 Merge "Renderscript: rename .rs extension to .rscript" 2019-07-17 18:04:18 +00:00
Colin Cross
a6ac80a894 Merge changes from topic "buildnumberfromfile" am: 223e6a65b6 am: 9dbe4eea79 am: 1ad744326f
am: 6f88354ff0

Change-Id: I41c501cdae4dff2b9a4fbd188ad9fd490a55b389
2019-07-16 20:27:14 -07:00
Colin Cross
9dbe4eea79 Merge changes from topic "buildnumberfromfile"
am: 223e6a65b6

Change-Id: I4e2f0514434ddf6833d03334dbf36869d762214e
2019-07-16 19:59:12 -07:00
Colin Cross
223e6a65b6 Merge changes from topic "buildnumberfromfile"
* changes:
  Allow jar wrapper to take quoted arguments
  Add rspfile support to RuleBuilder
  Prepare droiddoc for using RuleBuilder
  Manually escape BuildNumberFromFile
  Fix android.Expand and ninja escaping
  Add RuleBuilder helper functions for built and prebuilt tools
  Add documentation to droiddoc.go module types
2019-07-17 02:45:03 +00:00
Peter Collingbourne
636ecfcea3 Merge "Use LLD for partialLd." am: 2e16e2d9e1 am: d0ae5425be am: 030e5780ce
am: a1464c8e2c

Change-Id: I7b22dc51efbfd2eea666f245d42f82d522dd35de
2019-07-16 18:46:29 -07:00
Peter Collingbourne
d0ae5425be Merge "Use LLD for partialLd."
am: 2e16e2d9e1

Change-Id: I1492850ecfaa0f3bd42ca6b4308fc13f31d3e939
2019-07-16 18:18:23 -07:00
Mitch Phillips
da9a463794 Add the cc_fuzz target.
Adds the cc_fuzz target via a cc_fuzz module. Also implements the
libclang runtime interface for the x86 toolchain to allow host-built
fuzzers.

Bug: 133261679
Bug: 137398545

Test: Build a fuzzer (with all topic patches), notice that you now
have a host-built fuzzer :)

Change-Id: I7fa069603415f40b3f12a002c253fca6e2aa1988
2019-07-16 16:30:53 -07:00
Peter Collingbourne
84d8385ae1 Use LLD for partialLd.
Clang will soon start using relocations that are currently unsupported by
the version of ld.bfd that Android uses when HWASAN is enabled. This will
cause partialLd to fail since the clang driver defaults to ld.bfd.

Switch to using LLD, since it will support those relocations.

Change-Id: I0964f53dc63773f3b52bb377f863df9c39961a07
2019-07-16 14:14:36 -07:00
Colin Cross
5822b552ef Manually escape BuildNumberFromFile
Change ctx.Config().BuildNumberFromFile() to be unescaped, and then
escape it manually where necessary.  This will allow passing
ctx.Config().BuildNumberFromFile() to RuleBuilder, which will handle
the necessary escaping.

Test: no change to out/soong/build.ninja
Change-Id: I5329ab2ba70ccea49958864488aa81794a7e4b56
2019-07-16 10:23:41 -07:00
Dimitry Ivanov
bf5ba930a3 Merge "Make relative path for native_bridge binaries configurable" am: 2ca7a8835e am: 1866802e07 am: ddf273bcd4
am: fb87e6edd4

Change-Id: If726d707de98a962005329a2040886ca3559e0b8
2019-07-16 03:01:03 -07:00
Dimitry Ivanov
1866802e07 Merge "Make relative path for native_bridge binaries configurable"
am: 2ca7a8835e

Change-Id: I2cc8f8145c6464cf0ab91a602a5861ffc5a24505
2019-07-16 02:43:41 -07:00
Dimitry Ivanov
2ca7a8835e Merge "Make relative path for native_bridge binaries configurable" 2019-07-16 09:17:35 +00:00
Jeff Vander Stoep
41ce1c0d82 Renderscript: rename .rs extension to .rscript
Reserve .rs extension for Rust.

Bug: 137365032
Test: make checkbuild
Test: cd frameworks/compile/slang/tests
    ./slang_tests.py
    Test: atest CtsRenderscriptTestCases
    Test: CtsRsCppTestCases

Change-Id: I0458009b8bb64a012fece364835d5b78d52e15e9
2019-07-15 21:14:36 -07:00
dimitry
8d6dde8831 Make relative path for native_bridge binaries configurable
This change introduces NativeBridgeRelativePath and
NativeBridgeSecondaryRelativePath product variables to
make relative path to native_bridge binaries configurable.

It also removes moves information about native bridge
host architecture to Target and sets it during decodeTargetProductVariables

Test: make PRODUCT-cf_x86_phone-userdebug dist
Change-Id: Ie736e81eae507e1775566ce9f29135011b12af27
2019-07-15 20:04:07 +02:00
Elliott Hughes
e0ae25908f Merge "Stop defining unused USE_SSSE3." am: b940a1499b am: 0a4996eae5 am: f095f970d1
am: 40f658296c

Change-Id: I3c0949e8ec02afd75530eb51131ed68d9351aa5f
2019-07-13 10:50:31 -07:00
Elliott Hughes
0a4996eae5 Merge "Stop defining unused USE_SSSE3."
am: b940a1499b

Change-Id: I1ffdadb67b35ef899db10b49253f2c93073527c7
2019-07-13 10:23:29 -07:00
Treehugger Robot
b940a1499b Merge "Stop defining unused USE_SSSE3." 2019-07-13 16:59:49 +00:00
Elliott Hughes
b22dcfe05c Stop defining unused USE_SSSE3.
This copy & paste has even made it into the fuchsia configuration...

Test: builds
Change-Id: If22615fdf04448c058db014d93155e6264fb3eb2
2019-07-12 22:40:45 -07:00
Mitch Phillips
cf3d0b7b05 Merge "Re-enable ASAN globals instrumentation for devices." am: 68c9eed6b2 am: 88cddcf297 am: b580aec045
am: 039403974e

Change-Id: I198e8db875b19064106205e2643bdb4a28150c14
2019-07-12 14:00:15 -07:00
Mitch Phillips
88cddcf297 Merge "Re-enable ASAN globals instrumentation for devices."
am: 68c9eed6b2

Change-Id: I8a29cd64cd1c9a60adcc1bc8858163a1589cc20e
2019-07-12 13:20:19 -07:00
Stephen Hines
66c8b446aa Add support for AUTO_*_INITIALIZE to build/soong.
Bug: http://b/131390872
Test: Builds with/without AUTO_ZERO_INITIALIZE set.
Test: Builds with/without AUTO_PATTERN_INITIALIZE set.

Change-Id: If085ec53c619e2cebc86ca23f7039298160d99ae
2019-07-12 02:22:10 -07:00
Mitch Phillips
cba311bcfc Re-enable ASAN globals instrumentation for devices.
ASan globals instrumentation apparently broke the build in the pass.
This is now a customer feature to get this up and running, let's see if
it works.

Bug: 137312732

Test: Build the platform, deploy and run an asan-ified test (maybe
resolv_integration_test?).

Change-Id: Ic4ee0db617c290d8a3fec52db4b90bc4772696b8
2019-07-11 17:16:58 -07:00
Colin Cross
ee94d6ab14 Add RuleBuilder helper functions for built and prebuilt tools
Replace the common pattern of:
cmd.Tool(ctx.Config().HostToolPath(ctx, "tool"))
with:
cmd.BuiltTool("tool")

And similarly for PrebuiltBuildTool.

Test: m checkbuild
Change-Id: I7d63188505362c7df6a3b3e7330b4a2cca5a2409
2019-07-11 13:05:19 -07:00
Jiyong Park
d1e9c0c7e1 Merge "Use ctx.Target().NativeBridge to detect if the arch is translated or not" am: f378a85523 am: 6374a89990 am: 9435f3233f
am: 394c644aaf

Change-Id: Iacd3f4a7411d849a602f8df2498c6f6512e44a4d
2019-07-10 19:02:06 -07:00