StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,794 Commits 1 Branch 0 Tags
7bcaee1d128178d51509c93a9da974e74a05c253
Commit Graph

4191 Commits

Author SHA1 Message Date
Artur Satayev
533b98cde3 Don't track modules that are only available to APEXes. 
Modules that are not available for platform are developed with
updatability in mind, and do not require manual approvals.

Bug: 181223240
Test: checkbuild
Change-Id: I10b91053b3ef5a9ff5400d9d7a68fae3144a671c
 2021-03-11 18:13:18 +00:00
Paul Duffin
214dcbbc77 Merge "Ensure java_system_modules_import uses prebuilts" am: fc9c218e83 am: 5b58ea07dd am: 999d00098d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1627999

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5cb81d9cc34b6cd4e73f49d54cf4f4a86f871ea5
 2021-03-11 17:38:15 +00:00
Paul Duffin
1d4b35b6c8 Merge "Improve system modules tests" am: a2fcd19aef am: 5afefecf0e am: a2b0fc68e8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628002

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I173dcc684b9601b286d063181789abb003a91f89
 2021-03-11 17:37:28 +00:00
Paul Duffin
999d00098d Merge "Ensure java_system_modules_import uses prebuilts" am: fc9c218e83 am: 5b58ea07dd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1627999

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4645b4ed61b55c80efaf272ef9af5fd1e8339160
 2021-03-11 16:57:02 +00:00
Paul Duffin
a2b0fc68e8 Merge "Improve system modules tests" am: a2fcd19aef am: 5afefecf0e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628002

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d6a6cb9697c408a1dcb2b71b20b766141624020
 2021-03-11 16:56:48 +00:00
Paul Duffin
5b58ea07dd Merge "Ensure java_system_modules_import uses prebuilts" am: fc9c218e83 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1627999

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0add314d0582d2bdf9079a1c3e992f8fe0ad8127
 2021-03-11 16:17:54 +00:00
Paul Duffin
5afefecf0e Merge "Improve system modules tests" am: a2fcd19aef 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628002

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie69ddc34efca822bd9a7cd49cad93d6b0831242a
 2021-03-11 16:17:21 +00:00
Paul Duffin
4e99ef761a Improve name of getModuleHeaderJarsAsNormalizedPaths 
Bug: 182402568
Test: m nothing
Change-Id: I93bfe10f0ac62bf018cfee6738fa080d9404b1cb
 2021-03-11 15:53:25 +00:00
Paul Duffin
fc9c218e83 Merge "Ensure java_system_modules_import uses prebuilts" 2021-03-11 15:50:58 +00:00
Paul Duffin
a2fcd19aef Merge "Improve system modules tests" 2021-03-11 15:50:34 +00:00
Paul Duffin
f270882173 Merge "Convert system modules tests to use fixtures" am: 6f688d03c8 am: df0b483089 am: fea2bed0f8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628001

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11eb84903c7394cbc5b5e774e1c64bd3f355e80c
 2021-03-11 15:46:30 +00:00
Paul Duffin
d4831e4d8a Merge "Separate system modules tests into their own file" am: 8075291a94 am: 7c05abc397 am: 044abfd9a1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628000

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I802acaf6b80b1190750abbdd96c0d161ae3a4e07
 2021-03-11 15:46:22 +00:00
Paul Duffin
3a7399b7d2 Merge "prebuilt_apis should create a java_system_modules_import" am: f18ff339a9 am: 08e8a82ebb am: 2543e840af 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626518

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20b4649e39812b1e53bafe3ba13179823afb5dfc
 2021-03-11 15:46:14 +00:00
Jaewoong Jung
8faade67a4 Merge "Populate baseline_file values." am: 48b8df14be am: 4bc4800ce7 am: 41dea7a344 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1624707

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ca117224b92585601b2a542f98ee2a776c4895c
 2021-03-11 15:46:02 +00:00
Paul Duffin
fea2bed0f8 Merge "Convert system modules tests to use fixtures" am: 6f688d03c8 am: df0b483089 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628001

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4aebc9e5b74c373a6072286a454ed721e53be7f
 2021-03-11 15:41:41 +00:00
Paul Duffin
044abfd9a1 Merge "Separate system modules tests into their own file" am: 8075291a94 am: 7c05abc397 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628000

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a4bff6fc543c1c378a834fb9a615c6689216859
 2021-03-11 15:41:32 +00:00
Paul Duffin
2543e840af Merge "prebuilt_apis should create a java_system_modules_import" am: f18ff339a9 am: 08e8a82ebb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626518

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5228bb68a51f01cf94019f04ad89178220bb9095
 2021-03-11 15:41:27 +00:00
Jaewoong Jung
41dea7a344 Merge "Populate baseline_file values." am: 48b8df14be am: 4bc4800ce7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1624707

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00cc4e320a9013689b7ef5e0f253379df8935d1b
 2021-03-11 15:41:14 +00:00
Paul Duffin
df0b483089 Merge "Convert system modules tests to use fixtures" am: 6f688d03c8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628001

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I72ab39aa93ad79fd53f97ca3b3eb08ea327451e8
 2021-03-11 15:21:42 +00:00
Paul Duffin
7c05abc397 Merge "Separate system modules tests into their own file" am: 8075291a94 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628000

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I629d3459f4c2467233baadd891d6e11630900208
 2021-03-11 15:21:32 +00:00
Paul Duffin
08e8a82ebb Merge "prebuilt_apis should create a java_system_modules_import" am: f18ff339a9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626518

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I920b5d2496f956ac41ba6a631c848445d7c36ffb
 2021-03-11 15:21:18 +00:00
Jaewoong Jung
4bc4800ce7 Merge "Populate baseline_file values." am: 48b8df14be 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1624707

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3586bc9e7bc9f8e31ec98c3fb021f3ad1f7d7cc
 2021-03-11 15:20:56 +00:00
Paul Duffin
6f688d03c8 Merge "Convert system modules tests to use fixtures" 2021-03-11 15:11:20 +00:00
Paul Duffin
8075291a94 Merge "Separate system modules tests into their own file" 2021-03-11 15:10:54 +00:00
Paul Duffin
f18ff339a9 Merge "prebuilt_apis should create a java_system_modules_import" 2021-03-11 15:09:47 +00:00
Jaewoong Jung
48b8df14be Merge "Populate baseline_file values." 2021-03-11 15:04:52 +00:00
Paul Duffin
4f0a75abde Ensure java_system_modules_import uses prebuilts 
Make sure that java_system_modules_import always depends on the
prebuilt by adding dependencies in the ComponentDepsMutator() method
which is called before prebuilts without a corresponding source are
renamed from prebuilt_<x> to <x>. That requires the prebuilt_ prefix
to be provided but it ensures that the dependencies are safe.

Similar logic also makes sure java_system_modules always depends on
the source module and not on a renamed prebuilt module.

Bug: 182402568
Test: m nothing
Change-Id: I30db95978f5d9b205951011edf40585ee36c0c4c
 2021-03-11 09:40:02 +00:00
Paul Duffin
c52bea9555 Improve system modules tests 
The previous approach of looking for substrings in the command that
matched the base name of the jar could not differentiate between
whether the jar was a prebuilt or a source as they both have the same
base name.

The tests also did not cover the case when there was both prebuilts
and source modules.

This change:
1. Checks that the inputs to the command come from the appropriate
   module.
2. Adds a mixed test.
3. Deduped the source and prebuilt module definitions.

The new test reveals the buggy behavior which will be fixed in a follow
up change.

Bug: 182402568
Test: m nothing
Change-Id: I384ecca097cbe3560e7589c23fb99c176a42fd9b
 2021-03-11 09:39:18 +00:00
Paul Duffin
f23e346f6c Convert system modules tests to use fixtures 
Bug: 182402568
Test: m nothing
Change-Id: I0535e60a692925b141e465d8e1ec92be21d54c88
 2021-03-11 08:32:01 +00:00
Paul Duffin
db284be913 Separate system modules tests into their own file 
java_test.go is getting too big.

Bug: 182402568
Test: m nothing
Change-Id: I9c3818f1d747a230fcb66687319a3a14d557a57c
 2021-03-11 08:21:49 +00:00
Paul Duffin
d6c2a65211 prebuilt_apis should create a java_system_modules_import 
Previously it was creating a java_system_modules which worked fine
because apart from the prebuilt nature the two are functionally
identical. However a follow up change will differentiate between them
which would break this code.

Bug: 182402568
Test: m nothing
Change-Id: Ifc13ce31235494e338d730c61a99d8887c5a2c5b
 2021-03-11 08:01:19 +00:00
Paul Duffin
f7f65dafb4 Add prebuilt_boot_image and add boot_images to sdk 
Bug: 177892522
Test: m nothing
Change-Id: I640359acd6840507f32d7034c97d4d1c7ff591e9
 2021-03-11 07:24:26 +00:00
Jaewoong Jung
bc098a5c26 Merge "Lineage properties support module references." am: 6df5e0307d am: c3df3c5396 am: 4bd1fc1763 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625101

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id5f3b9ab9ba11e274a4921a9ab07392b1bb891ff
 2021-03-11 03:04:25 +00:00
Colin Cross
de2c316d39 Merge "Add comment to lintPaths" am: 42e49979f2 am: 8aac2c3dd5 am: 72241f12c0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1624661

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71f4ccd1d39a604f3dbd8d724d4abe8eb2939b84
 2021-03-11 03:03:58 +00:00
Jaewoong Jung
4bd1fc1763 Merge "Lineage properties support module references." am: 6df5e0307d am: c3df3c5396 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625101

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8541e1e2aa1e9866e7616167f3305e2cd9c53419
 2021-03-11 02:19:57 +00:00
Colin Cross
72241f12c0 Merge "Add comment to lintPaths" am: 42e49979f2 am: 8aac2c3dd5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1624661

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib48bcb25eb1b6eb49ace54675e9eab42300e103c
 2021-03-11 02:19:00 +00:00
Colin Cross
9c78cb83d0 Propagate LANG environment variable to lint in RBE 
Without LANG, lint's text output is ASCII instead of UTF-8, causing
differences between local and remote execution.

Bug: 181681346
Bug: 182415460
Test: m USE_RBE=true RBE_LINT=true
Change-Id: I0ad54aa731582c9b54abb80f50ba508c75992b91
 2021-03-10 18:03:05 -08:00
Colin Cross
9b93af488b Default lint RBE to local exec strategy 
Match other tools by defaulting to local exec strategy.

Also use the local absolute path when using the local exec strategy.

Bug: 181681346
Test: m USE_RBE=true RBE_LINT=true
Test: m USE_RBE=true RBE_LINT=true RBE_LINT_EXEC_STRATEGY=remote
Change-Id: I1d6d20ec69663b99d6d9af1d8e5e67b48a5cd050
 2021-03-10 18:03:05 -08:00
Jaewoong Jung
c3df3c5396 Merge "Lineage properties support module references." am: 6df5e0307d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625101

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7fb218215e9b8c7395756ccbd78edf6674b259ad
 2021-03-11 02:00:38 +00:00
Jaewoong Jung
6df5e0307d Merge "Lineage properties support module references." 2021-03-11 00:59:32 +00:00
Paul Duffin
5844d0d0fd Merge "Support test fixtures in java package" am: 29e98e5ede am: 1d58079c9c am: 05d6367813 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625388

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib66c99c7e923574fbe54cca7d5314bdcc5d96adf
 2021-03-10 23:59:56 +00:00
Colin Cross
8aac2c3dd5 Merge "Add comment to lintPaths" am: 42e49979f2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1624661

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f65aebc59148f74b9b603a6733bcb477ef4576c
 2021-03-10 23:31:24 +00:00
Paul Duffin
05d6367813 Merge "Support test fixtures in java package" am: 29e98e5ede am: 1d58079c9c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625388

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04d2ad1baa81b48eb8e53e3adc42751faebf613c
 2021-03-10 23:14:07 +00:00
Paul Duffin
1d58079c9c Merge "Support test fixtures in java package" am: 29e98e5ede 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625388

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95df61b5ae8df324258623c760f9ece1c4a0c1e5
 2021-03-10 23:05:24 +00:00
Colin Cross
42e49979f2 Merge "Add comment to lintPaths" 2021-03-10 22:55:03 +00:00
Paul Duffin
29e98e5ede Merge "Support test fixtures in java package" 2021-03-10 22:27:00 +00:00
Colin Cross
0e434dde79 Merge changes from topic "lint_rbe" am: 068f33f6cf am: d475665a61 am: c6b8d7f70e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621780

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f224d2aac889c6325c38415df2da3e3778fe2ea
 2021-03-10 21:03:05 +00:00
Colin Cross
c6b8d7f70e Merge changes from topic "lint_rbe" am: 068f33f6cf am: d475665a61 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621780

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib93088ac7ffae99efebbfd8dc372724d80bd77e0
 2021-03-10 20:32:04 +00:00
Colin Cross
d475665a61 Merge changes from topic "lint_rbe" am: 068f33f6cf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621780

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9f00672cd11d70f34cf283378c907a8b168715dc
 2021-03-10 20:13:18 +00:00
Jaewoong Jung
75c7cead62 Delete defaultsFactory in java.go. 
The factory function became obsolete a long time ago. The module
description text will be correctly extracted with this change.

Test: TreeHugger
Change-Id: If4eb936d34e5a71e6f298f53827a887f34af7cae
 2021-03-10 11:41:50 -08:00