Commit Graph

1304 Commits

Author SHA1 Message Date
Colin Cross
4c83e5ccd4 Support testing Rules in Modules and Rules and Builds in Singletons
Add support for TestingModule to return RuleParams for rules created
by the module.

Refactor TestingModule to use helpers, and use the helpers to
implement a similar TestingSingleton.

Use the new functionality to test RuleBuilder's module and singleton
rules.

Test: none
Change-Id: I8348c56ff5086d0c49401f5a00faf7c864e6b6f3
2019-03-05 03:17:26 +00:00
Colin Cross
9a4a2f313a Replace *Escape with *EscapeList am: 0b9f31fb08 am: 5b6741d94d
am: 29560640a9

Change-Id: I04930d0949d8fb3317317aad7f577b75e47a9505
2019-03-04 10:30:20 -08:00
Colin Cross
0b9f31fb08 Replace *Escape with *EscapeList
Follow the change to blueprint to make *Escape take and return a string
and add *EscapeList that take and return slices of strings.  Fix up
a few places that were unnecessarily converting a string to a slice
and back to a string.

Test: m nothing
Change-Id: I3fa87de175522205f36544ef76aa2f04aef1b936
2019-03-04 18:11:53 +00:00
Pirama Arumuga Nainar
956c2c64c7 Merge "Enable coverage universally if COVERAGE_PATHS includes "*"" am: 7abf560cb0 am: 6637d37544
am: c396834992

Change-Id: I24b02a862613418cc404e860cfe01e5028a4e7a5
2019-03-04 09:02:55 -08:00
Pirama Arumuga Nainar
7abf560cb0 Merge "Enable coverage universally if COVERAGE_PATHS includes "*"" 2019-03-04 16:31:51 +00:00
Mark Salyzyn
d812fd628d Merge "Add required: to debuggable" am: f57bfee1d1 am: dc1b185cfe
am: 41dcde45af

Change-Id: Id0a7559ba6d80e1b14a5be9a280c05a3e399cc6d
2019-03-04 07:42:47 -08:00
Pirama Arumuga Nainar
4e128282f2 Enable coverage universally if COVERAGE_PATHS includes "*"
http://b/116873221

This will be used in a target in the build server to build all native
code with coverage.

Test: 'm NATIVE_COVERAGE=true COVERAGE_PATHS=* nothing' works as
expected.

Change-Id: I55d644ed9212c4ab0f1e4a00aac3a467fcf2a463
2019-03-01 16:17:53 -08:00
Mark Salyzyn
aaf53538bb Add required: to debuggable
Permit product_varables: { debuggable: { required: ["remount"], }, },
so that we can add debug dependencies between build objects.

Test: compile
Bug: 122602260
Change-Id: Ibb4c5bf368f90fdb007d30b6c1da63cb9d4c6467
2019-03-01 15:14:52 -08:00
Alex Light
c6d6380c34 Merge "Add support for including py_binary and *_go_binary in apexs" am: f8711f053c am: 6b7ea48868
am: 95333c25e5

Change-Id: I87ec345448112a7e06d8d8adb7cda1493a9f0b70
2019-02-28 20:22:43 -08:00
Alex Light
778127a041 Add support for including py_binary and *_go_binary in apexs
These additional binary types are useful for some apexs. Add the
ability to include them. Due to the nature of the resulting artifacts
only py binaries with embedded launchers and host go binaries are
supported.

Test: m com.android.support.apexer
Bug: 119332365
Bug: 119332362
Change-Id: I27c253d3647cf7bbe15896610d7a74a5f93e8bec
2019-03-01 01:56:14 +00:00
Jaewoong Jung
2cfaf135a4 Merge "Revert "Add override_module."" am: ef36053829 am: 4ab2e63974
am: d26cc522ac

Change-Id: Iab70e8d689eea96831afd4f3b696122b98c99d9b
2019-02-28 15:51:16 -08:00
Treehugger Robot
ef36053829 Merge "Revert "Add override_module."" 2019-02-28 23:10:33 +00:00
Jaewoong Jung
acb6db331b Revert "Add override_module."
This reverts commit aa65e17016.

Reason for revert: Not compatible with PRODUCT_PACKAGES, and so has very limited use.

Change-Id: Ib141d3984a6f12bb50989e66037494c466b066f1
2019-02-28 16:22:30 +00:00
Roland Levillain
33d232ad61 Merge "Fix soong.android.RuleBuilderCommand.FlagWithList's comment." am: 2833d984fb am: 5d2de1b78c
am: 37ba9f1fdb

Change-Id: I4d148b99471034a8714d9bd268330e0e36ad63b4
2019-02-28 03:15:30 -08:00
Roland Levillain
2833d984fb Merge "Fix soong.android.RuleBuilderCommand.FlagWithList's comment." 2019-02-28 10:58:52 +00:00
Jaewoong Jung
049aea10f5 Merge "Add override_module." am: b709575a75 am: e8eaf4608d
am: b44bb0896b

Change-Id: I4c8faef56835a1e7d334f8dade5623c9ea07df3e
2019-02-27 20:13:56 -08:00
Treehugger Robot
b709575a75 Merge "Add override_module." 2019-02-28 03:46:23 +00:00
Jaewoong Jung
aa65e17016 Add override_module.
This new module type replaces the inherit-package function in make by
allowing developers to override the name, the certificate, and the
manifest package name of an android_app module.

Bug: 122957760
Fixes: 123640028
Test: app_test.go + BrowserGoogle
Change-Id: Iefe447e7078b25039233221361ef95c83a29973a
2019-02-27 14:35:39 -08:00
Patrice Arruda
4a77a1c092 Merge "Add a host prebuilt module type for usr/share." am: 368a97286b am: ecaae42150
am: 87a0cc06c9

Change-Id: I303afaae56e058671469911a9b7885898ee2a7f7
2019-02-27 14:29:07 -08:00
Patrice Arruda
368a97286b Merge "Add a host prebuilt module type for usr/share." 2019-02-27 22:10:31 +00:00
Colin Cross
b66f1b0faf Fix Rel() after ReplaceExtension or InSameDir am: 2cdd5df7cc am: 54466adccc
am: ea72c068c3

Change-Id: I0292ca0c18a2f57619402bc648f4f8ec244eba7d
2019-02-27 12:55:44 -08:00
Colin Cross
2cdd5df7cc Fix Rel() after ReplaceExtension or InSameDir
Copying p.rel doesn't work, as rel needs to match the end of the
value in path.  Apply the same transformation to p.rel as p.path.

Test: paths_test.go
Change-Id: I42d676c6c4fc18d9852c1a73f25e5a791d7553d0
2019-02-27 20:23:25 +00:00
Roland Levillain
2da5d9a5fe Fix soong.android.RuleBuilderCommand.FlagWithList's comment.
Test: n/a
Change-Id: I96158244feaaaa25ada02275e20418ac30218004
2019-02-27 16:56:41 +00:00
Patrice Arruda
300cef9856 Add a host prebuilt module type for usr/share.
This is almost the same as prebuild_etc except the base path.

Bug: 122616578
Test: prebuilt_etc_test.go
Change-Id: I512b17a88062403225ae6ec248f857c88fccf47a
2019-02-26 09:18:35 -08:00
Jaewoong Jung
c98cbaf104 Merge "Split up Soong build doc." am: e608a51b06 am: 1d61042690
am: c7ab1704e3

Change-Id: I7483d25d3325c84a6f87f142bcf05878a9f5dd5f
2019-02-25 08:54:52 -08:00
Colin Cross
4dab988c4c Pass DEXPREOPT_BOOT_JARS_MODULES to Make am: 9be4152c21 am: 2b34ef2fd3
am: edc6b9c1e0

Change-Id: I3e8ed02d1b95393bd2203758e426678e803f7671
2019-02-22 20:43:50 -08:00
Colin Cross
4bff473af2 Make RuleBuilder methods take Paths am: 69f59a3327 am: fafab5c1ec
am: d123cd7459

Change-Id: I5277142b7486c80c1c93d2ecd9a90b387d93c4a9
2019-02-22 20:35:45 -08:00
Jaewoong Jung
e608a51b06 Merge "Split up Soong build doc." 2019-02-22 15:42:49 +00:00
Colin Cross
9be4152c21 Pass DEXPREOPT_BOOT_JARS_MODULES to Make
Make is not setting PreoptBootJars, pass the value computed in
Soong back to Make.

Test: m checkbuild
Change-Id: Ie3db926df9c5d6bf18db1003b95823c7566800a9
2019-02-20 22:06:30 -08:00
Colin Cross
69f59a3327 Make RuleBuilder methods take Paths
There are no more Make paths being used in Soong now that
dexpreopting and hiddenapi are in Soong. Use the Path types
in the inputs to RuleBuilder, and fix all users of RuleBuilder.

This reapplies I886f803d9a3419a43b2cae412537645f94c5dfbf with
fixes to disable preopt for Soong-only builds when the global
dexpreopt.config doesn't exist.

Test: all soong tests
Test: m checkbuild
Change-Id: I4dae9ecd5de22f062f9478ec8f0747f099cf8190
2019-02-20 22:06:09 -08:00
Colin Cross
395d1b0ecb Merge "Revert "Make RuleBuilder methods take Paths"" am: 501d7e594a am: dc68f8826c
am: ec60a92074

Change-Id: I4519fd0157c6f1287135879ad42a2d1ffaf59515
2019-02-20 21:17:11 -08:00
Colin Cross
501d7e594a Merge "Revert "Make RuleBuilder methods take Paths"" 2019-02-21 05:03:41 +00:00
Colin Cross
ab898dc4a4 Revert "Make RuleBuilder methods take Paths"
This reverts commit acdd694071.

Reason for revert: broke ndk build

Change-Id: I5655e48c15eb8f5f0267afdd853fbc25765b8623
2019-02-21 05:03:00 +00:00
Colin Cross
43e1ff5337 Merge "Make RuleBuilder methods take Paths" am: 4bb6764de9 am: 4ebb84d392
am: fc2da332e9

Change-Id: Ic6563627f7853d9850e996d4579ac671d47d2c7b
2019-02-20 20:22:51 -08:00
Colin Cross
4bb6764de9 Merge "Make RuleBuilder methods take Paths" 2019-02-21 04:06:18 +00:00
Sasha Smundak
23e19eff31 Merge "Implement vts_config module" am: e344fb5fb1 am: a4f4607862
am: dd36b0ccf3

Change-Id: I71493cdabc1dd62b74d35b1ab47f02d50762539f
2019-02-20 15:57:58 -08:00
Jaewoong Jung
6c29688691 Split up Soong build doc.
Previously the build doc was a gigantic list of modules and properties,
which can be overwhelming to new users. This change breaks it up by
packages, so that it is easier to look up and feels more coherent.

Bug: 123521276
Test: m soong_docs
Change-Id: I1a1a331f4b4deb8782d698e9076098c5a27b9566
2019-02-20 15:43:06 -08:00
Colin Cross
acdd694071 Make RuleBuilder methods take Paths
There are no more Make paths being used in Soong now that
dexpreopting and hiddenapi are in Soong. Use the Path types
in the inputs to RuleBuilder, and fix all users of RuleBuilder.

Test: all soong tests
Test: m checkbuild
Change-Id: I886f803d9a3419a43b2cae412537645f94c5dfbf
2019-02-20 14:23:37 -08:00
Treehugger Robot
e344fb5fb1 Merge "Implement vts_config module" 2019-02-20 22:23:16 +00:00
Dan Albert
6b3956d122 Merge "Revert "Remove armv7-a without neon support"" am: 48db2b15fb am: ecbadc5b6c
am: 856c8234f2

Change-Id: Ica4d9b0b474c6be9dd273dab71f33f013abaf6dc
2019-02-20 05:39:39 -08:00
Treehugger Robot
48db2b15fb Merge "Revert "Remove armv7-a without neon support"" 2019-02-20 12:56:37 +00:00
Colin Cross
94330f7d5a Merge "Allow Singletons to export Make variables" am: 4c317f1cbb am: cd1cbd1f28
am: 361874f238

Change-Id: Ibcf9c69a8f4dab4957be029d4db9ccb49451102f
2019-02-20 00:50:11 -08:00
Treehugger Robot
4c317f1cbb Merge "Allow Singletons to export Make variables" 2019-02-20 08:38:23 +00:00
Colin Cross
0173b4709f Merge changes I7801fc7c,I7d407bd1 am: aa1491fd41 am: 22e64a35e2
am: a01f17a341

Change-Id: Ide92c900d84b9922feea1ce0df357a28d2039c7b
2019-02-19 23:29:35 -08:00
Colin Cross
aa1491fd41 Merge changes I7801fc7c,I7d407bd1
* changes:
  Add CopyOf utility method
  Fix a bug in OncePer.Get that could return a waiter
2019-02-20 07:15:17 +00:00
Colin Cross
55bc3f9b76 Merge "Don't check ABIs in SecondArchIsTranslated" am: 98690957d0 am: 84d6594f99
am: b36b44d919

Change-Id: Ib7e28fca7361ede15098c95f4aecca010ebe6685
2019-02-19 22:24:06 -08:00
Sasha Smundak
ff36da04e8 Implement vts_config module
Test: internal (see android/vts_config_test.go) + run 'm vts' and check
that host/linux-x86/vts/android-vts.zip remians the same
Change-Id: I0249a974a240e7669c3b9378c17739df8e120873
Fixes: 122617100
2019-02-19 16:58:43 -08:00
Dan Albert
8818f49989 Revert "Remove armv7-a without neon support"
Unfortunately we still need to build the NDK sysroot as non-NEON
since that's still supported, though it's no longer the default.

This reverts commit f4e0601c7e.

Test: treehugger
Test: rebuilt NDK sysroot and imported into the NDK, ran NDK tests
Bug: None
2019-02-19 13:53:01 -08:00
Colin Cross
ed023eca73 Allow Singletons to export Make variables
Register any Singletons that implement a MakeVars method as
MakeVarsProviders, and convert the hiddenapi singleton to
use it.

Test: m checkbuild
Change-Id: I6a2044ad34ef46a8b267762ddfeb51aa01d7734d
2019-02-19 12:45:14 -08:00
Colin Cross
454c087be6 Add CopyOf utility method
Add a utility method that returns a copy of a slice of strings.
This is primarily useful when appending to a string slice to avoid
accidentally reusing the backing array.

Test: util_test.go
Change-Id: I7801fc7ca19e27ddc9f1b1b452788b723c7f619c
2019-02-19 11:19:09 -08:00