Commit Graph

12476 Commits

Author SHA1 Message Date
Colin Cross
1885ec2b79 Add dexpreopt_bootjars_test.go am: 762286723a am: 2c81ab734f
am: 15836b9ceb

Change-Id: I4d047c47d783f6e788eeccdf83dab646338d15d8
2019-03-04 19:40:21 -08:00
Colin Cross
33db6a29cc Move some java test setup later am: c28bb0b8f9 am: 7e2b9c48ca
am: 7cb6f9e601

Change-Id: Ib0924d35bc9cd844a071e5f8729f5e2f7b8b6745
2019-03-04 19:40:03 -08:00
Colin Cross
84e8518011 Fix RuleBuilder.Restat am: baa676f671 am: ee3c74b457
am: d4c4cd24ca

Change-Id: Ic1340df1f9d22de22104d9807fe2266ba67f341c
2019-03-04 19:39:46 -08:00
Colin Cross
45a23c7230 Support testing Rules in Modules and Rules and Builds in Singletons am: 4c83e5ccd4 am: 6a64436220
am: 68193be3be

Change-Id: I413bb20b70bb91e1d76379c5974b06dcb2669dff
2019-03-04 19:39:28 -08:00
Colin Cross
15836b9ceb Add dexpreopt_bootjars_test.go am: 762286723a
am: 2c81ab734f

Change-Id: I0fa870f1ac48f7c64a449b16e4180fb9a04ad230
2019-03-04 19:36:11 -08:00
Colin Cross
7cb6f9e601 Move some java test setup later am: c28bb0b8f9
am: 7e2b9c48ca

Change-Id: I1d5279a23925c260e8602c4fb7b2a4c8d1267f66
2019-03-04 19:35:56 -08:00
Colin Cross
d4c4cd24ca Fix RuleBuilder.Restat am: baa676f671
am: ee3c74b457

Change-Id: Id735ac676a33e7f78663575b7f20294937cbf1af
2019-03-04 19:35:42 -08:00
Colin Cross
68193be3be Support testing Rules in Modules and Rules and Builds in Singletons am: 4c83e5ccd4
am: 6a64436220

Change-Id: Iedbaeafe803943dc07c6ea506c1a017759d9eacc
2019-03-04 19:35:26 -08:00
Colin Cross
2c81ab734f Add dexpreopt_bootjars_test.go
am: 762286723a

Change-Id: I47beab59d7ec61652f673de8dd2691fbce7e2677
2019-03-04 19:27:51 -08:00
Colin Cross
7e2b9c48ca Move some java test setup later
am: c28bb0b8f9

Change-Id: Ib22830370d27e853151cc4419f6bbe791568a645
2019-03-04 19:27:41 -08:00
Colin Cross
ee3c74b457 Fix RuleBuilder.Restat
am: baa676f671

Change-Id: Iaa35d96743fe84d98a65a3c355a159739976a479
2019-03-04 19:27:31 -08:00
Colin Cross
6a64436220 Support testing Rules in Modules and Rules and Builds in Singletons
am: 4c83e5ccd4

Change-Id: If0fc3ebf39c1556fa447367f90650325d43c43ec
2019-03-04 19:27:21 -08:00
Colin Cross
762286723a Add dexpreopt_bootjars_test.go
Add a test that exercises the dexpreopt_bootjars.go singleton.

Test: dexpreopt_bootjars_test.go
Change-Id: I01d4f6e22f6ff7b809af043391d7b6209dcb8675
2019-03-05 03:17:51 +00:00
Colin Cross
c28bb0b8f9 Move some java test setup later
Move ctx.Register() from testContext() to run() so that tests can
register more singletons before the env singleton is registered.
Any singletons registered after the env singleton will hit an error
if they attempt to read an environment variable.

Move setDexpreoptTestGlobalConfig from TestConfig to run() so that
a test can set their own custom config after TestConfig but before
run().

Test: All Soong tests
Change-Id: Iec47f4b7898736f583cbd6bd53e4d02a035f4fb2
2019-03-05 03:17:42 +00:00
Colin Cross
baa676f671 Fix RuleBuilder.Restat
RuleBuilder.Restat wasn't being propagated to the rule.

Test: rule_builder_test.go
Change-Id: Ie64c8076692ea10a0c47ed5a8832e3f553bea0fc
2019-03-05 03:17:33 +00:00
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
513b76d51f Update manifest merger to use binary am: 87ecbfe107 am: d8f3e6f5d4
am: 867b1daec4

Change-Id: I72f9f76865d19495cb340adcf5244e8c7f2f8a38
2019-03-04 14:24:58 -08:00
Colin Cross
867b1daec4 Update manifest merger to use binary am: 87ecbfe107
am: d8f3e6f5d4

Change-Id: I258a8d1cdc2da373dd644a9b29b80d6bfdc377c6
2019-03-04 14:20:47 -08:00
Colin Cross
d8f3e6f5d4 Update manifest merger to use binary
am: 87ecbfe107

Change-Id: Iec32b4830d19a170452ee269d84d94f1b1de2f3c
2019-03-04 14:13:37 -08:00
Colin Cross
87ecbfe107 Update manifest merger to use binary
Manifest merger is now a java_binary instead of a collection of jars,
it can use the single binary as the dependency.

Bug: 112607039
Test: m checkbuild
Change-Id: Iea6c97c99a3bb09952fed2b25437b644f4e863f8
2019-03-04 22:02:01 +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
29560640a9 Replace *Escape with *EscapeList am: 0b9f31fb08
am: 5b6741d94d

Change-Id: I6a9c3a6e5b52e35ce1185d01a22b2b7695f18fcc
2019-03-04 10:26:14 -08:00
Colin Cross
5b6741d94d Replace *Escape with *EscapeList
am: 0b9f31fb08

Change-Id: I18edabe44493f077c1b63f354dfc28029a9641d5
2019-03-04 10:22:10 -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
c396834992 Merge "Enable coverage universally if COVERAGE_PATHS includes "*"" am: 7abf560cb0
am: 6637d37544

Change-Id: I540bbd18fdcc6dc093c77fdc2d4b26c35add1dd2
2019-03-04 08:50:51 -08:00
Pirama Arumuga Nainar
6637d37544 Merge "Enable coverage universally if COVERAGE_PATHS includes "*""
am: 7abf560cb0

Change-Id: I3455ceca75450f15b68692e7ce52c9092e729528
2019-03-04 08:42:45 -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
Mark Salyzyn
41dcde45af Merge "Add required: to debuggable" am: f57bfee1d1
am: dc1b185cfe

Change-Id: Ieda773967dc4cb41f004a3f1a29407901af93781
2019-03-04 07:31:40 -08:00
Mark Salyzyn
dc1b185cfe Merge "Add required: to debuggable"
am: f57bfee1d1

Change-Id: I5c28878cac761dcb3cb380c284187e2f4f8cee85
2019-03-04 07:23:36 -08:00
Mark Salyzyn
f57bfee1d1 Merge "Add required: to debuggable" 2019-03-04 15:14:02 +00:00
Inseob Kim
ba8012f1b7 Merge "Ignore missing prebuilt_apis of java_sdk_library" am: 4be65809d7 am: 8740b4c27a
am: 28281cef98

Change-Id: I248d72e776b5bee568c1213b2ebd7130ce0793e6
2019-03-03 23:32:26 -08:00
Inseob Kim
28281cef98 Merge "Ignore missing prebuilt_apis of java_sdk_library" am: 4be65809d7
am: 8740b4c27a

Change-Id: I0ea1cfd96c9e51b882528ff6fc172e6c6189990a
2019-03-03 23:28:24 -08:00
Inseob Kim
8740b4c27a Merge "Ignore missing prebuilt_apis of java_sdk_library"
am: 4be65809d7

Change-Id: I3c4cdbedbe2f732f655e42d7ad19f8c264f24860
2019-03-03 23:24:22 -08:00
Treehugger Robot
4be65809d7 Merge "Ignore missing prebuilt_apis of java_sdk_library" 2019-03-04 07:20:55 +00:00
bralee
4ee5df9e99 Merge "Build System: Collect native dependent information from cc.go." am: cc5b384ea5 am: ea119a86a4
am: ec4290ac19

Change-Id: Ia8c7e5fb0c21eabf3a3fab30cae5c72bfe41143f
2019-03-03 22:17:16 -08:00
bralee
ec4290ac19 Merge "Build System: Collect native dependent information from cc.go." am: cc5b384ea5
am: ea119a86a4

Change-Id: I28fd383ddadba58b2538ac6ec93074b29896c9b7
2019-03-03 22:13:13 -08:00
bralee
ea119a86a4 Merge "Build System: Collect native dependent information from cc.go."
am: cc5b384ea5

Change-Id: I348e7f4a26080f779e3a6c1a9fb1d0e9c2f21d82
2019-03-03 22:09:10 -08:00
Treehugger Robot
cc5b384ea5 Merge "Build System: Collect native dependent information from cc.go." 2019-03-04 06:01:10 +00:00
Colin Cross
fac1c80666 Don't add static libs resources to implemenation jars am: 247e0cfaa4 am: 9cbdd49dc8
am: 8c25acf1fd

Change-Id: I084f186143006b7f8d5e6ba519fd890354703174
2019-03-03 21:53:10 -08:00
Colin Cross
8c25acf1fd Don't add static libs resources to implemenation jars am: 247e0cfaa4
am: 9cbdd49dc8

Change-Id: Icf1bce0b09cd74225bfc483c6d174a398787db99
2019-03-03 21:49:06 -08:00
Colin Cross
9cbdd49dc8 Don't add static libs resources to implemenation jars
am: 247e0cfaa4

Change-Id: I7857ac561d696371cc17fd337c061c99482157ea
2019-03-03 21:45:03 -08:00
Inseob Kim
38449af64f Ignore missing prebuilt_apis of java_sdk_library
Building java_sdk_library without defining prebuilt_apis has been
failing with weird error messages. So one have to touch empty txt files
and create prebuilt_apis module, even when the java_sdk_library is
brand-new and has no previous versions. This commit fixes it so that API
check against previous version is skipped, in the case of missing
prebuilt_apis.

Note that Current api txt files (placed under api/ directory) are still
needed (make update-api)

Bug: 126259114
Test: tries to build without touching empty api txt files.
Change-Id: I93630f4139cbf502621693ec315dc06c0d07d1c3
2019-03-04 10:56:53 +09:00
bralee
3f49f4d469 Build System: Collect native dependent information from cc.go.
Bug: 126957990
Test: 1. m aidegen
      2. $ANDROID_HOST_OUT/bin/aidegen-dev frameworks/native -v
      3. open out/soong/module_bp_java_deps.json
         check *.a and *.so files are added.

Change-Id: I82ba49d023621908f0be12abf529553aee45fa5b
2019-03-04 06:58:15 +08:00
Colin Cross
247e0cfaa4 Don't add static libs resources to implemenation jars
Static dependency resources will already be in the resources jar
and the implementation and resource jar, they shouldn't be in
the implementation jar.

Test: m checkbuild
Change-Id: I4d4dab1d2e55e92ba9a95a66b246c721b9bf6410
2019-03-03 11:34:47 -08:00
Julien Desprez
9d52cc480d Merge "Autogenerate some extra_options based on some build properties" am: afbddd8ddd am: 706f181876
am: 551b210548

Change-Id: I0b6955b9ee43e6d79320321609b47584194029eb
2019-03-01 17:24:22 -08:00
Julien Desprez
551b210548 Merge "Autogenerate some extra_options based on some build properties" am: afbddd8ddd
am: 706f181876

Change-Id: If0fc3d1481aad8fa122f190b79b40dc2005947f6
2019-03-01 17:15:16 -08:00
Julien Desprez
706f181876 Merge "Autogenerate some extra_options based on some build properties"
am: afbddd8ddd

Change-Id: Ic0daecc6b3151e8b917aee9dbbbbf0447ba92a93
2019-03-01 17:00:32 -08:00
Julien Desprez
afbddd8ddd Merge "Autogenerate some extra_options based on some build properties" 2019-03-02 00:44:54 +00:00