StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,996 Commits 1 Branch 0 Tags
152ae03d10ffb6fb7c51d110e4857603c0362aea
Commit Graph

4010 Commits

Author SHA1 Message Date
Jaewoong Jung
152ae03d10 Merge "Delete defaultsFactory in java.go." am: b37b009b16 am: 1e4e5172fa am: 5151495607 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626340

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I996c1d21275ddf9e8d56655eba0133838cf8fe29
 2021-03-12 20:30:18 +00:00
Jaewoong Jung
5151495607 Merge "Delete defaultsFactory in java.go." am: b37b009b16 am: 1e4e5172fa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626340

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I299401c7deef410726a6d3e046da74d887548200
 2021-03-12 19:49:26 +00:00
Julien Desprez
47101af8ed Merge "Remove the robolectric heuristic out of java_test" am: c001dc6d2f am: fb44fbd6be am: ba380e444b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1624564

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99286890e99bed27d4052ea7236eb97b9eddeafd
 2021-03-12 18:41:38 +00:00
Jaewoong Jung
b37b009b16 Merge "Delete defaultsFactory in java.go." 2021-03-12 18:37:38 +00:00
Julien Desprez
ba380e444b Merge "Remove the robolectric heuristic out of java_test" am: c001dc6d2f am: fb44fbd6be 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1624564

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie1873f12d4c79f61f58f0784320bc05f8ff2b452
 2021-03-12 16:51:42 +00:00
Julien Desprez
c001dc6d2f Merge "Remove the robolectric heuristic out of java_test" 2021-03-12 15:40:19 +00:00
Paul Duffin
7b9619008a Merge "Convert testDexpreoptBoot to use test fixtures" am: a8c443618a am: 34fc4cf2fb am: a84d532ae5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629622

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e1ec015f143bb018ec2de9c59c9f208f57c2921
 2021-03-12 13:47:08 +00:00
Paul Duffin
a84d532ae5 Merge "Convert testDexpreoptBoot to use test fixtures" am: a8c443618a am: 34fc4cf2fb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629622

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f6eb23663c51bf0024d03c8ce739647cd778113
 2021-03-12 13:04:31 +00:00
Remi NGUYEN VAN
d183965617 Merge "Revert "Reinstate the enforcement of stable core platform API usage"" into rvc-qpr-dev-plus-aosp 2021-03-12 12:03:39 +00:00
Remi NGUYEN VAN
8c12d89bed Revert "Reinstate the enforcement of stable core platform API usage" 
This reverts commit b528ed5fae.

Reason for revert: Breaks bramble build, b/182544394

Merged-In: Ieddaf859f568bc8ee486692474a4dec48b3d25e6
Change-Id: Iaf8f80f4b6f70da8d6e45a2619953534f87ea03b
 2021-03-12 10:16:52 +00:00
Paul Duffin
23090f4156 Merge "Add prebuilt_boot_image and add boot_images to sdk" am: 32a8aadfaa am: 7b1c7dc98f am: 2b2582abf0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626501

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic812c1303d09f536a4e23607c13b99a2487951d2
 2021-03-12 09:44:28 +00:00
Paul Duffin
a987df1281 Merge "Improve name of getModuleHeaderJarsAsNormalizedPaths" am: c7cdd1513c am: 83eb3ba314 am: 14cb8dd965 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628682

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I08356e305400519865ba41fb34da5057906ff81b
 2021-03-12 09:44:03 +00:00
Paul Duffin
2b2582abf0 Merge "Add prebuilt_boot_image and add boot_images to sdk" am: 32a8aadfaa am: 7b1c7dc98f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626501

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ee0f2947181bb5c28bf543246e8c713aa0beae5
 2021-03-12 09:02:51 +00:00
Paul Duffin
14cb8dd965 Merge "Improve name of getModuleHeaderJarsAsNormalizedPaths" am: c7cdd1513c am: 83eb3ba314 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628682

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68b75a9b92cf966ddfc1cfdfff746259164d74b4
 2021-03-12 09:02:32 +00:00
Paul Duffin
451aeef583 Convert testDexpreoptBoot to use test fixtures 
Bug: 181070625
Test: m nothing
Change-Id: Iaca15c87c68383630aed015e0e17adad3c37c4b1
 2021-03-12 09:02:13 +00:00
Paul Duffin
32a8aadfaa Merge "Add prebuilt_boot_image and add boot_images to sdk" 2021-03-12 08:06:45 +00:00
Paul Duffin
c7cdd1513c Merge "Improve name of getModuleHeaderJarsAsNormalizedPaths" 2021-03-12 07:59:39 +00:00
Daulet Zhanguzin
b528ed5fae Reinstate the enforcement of stable core platform API usage 
It appears as though change I3a39be5f0b8736de4822c6a14072c78d4e4ad89d
accidentally stopped enforcing the use of the stable core platform
API in AOSP when the changes from rvc-dev-plus-aosp-without-vendor were
merged in.

Unfortunately, since then some additional usages of legacy core
platform APIs have crept in so this adds the affected modules to the
list of modules allowed to use the legacy core platform APIs.

Bug: 180399951
Test: m checkbuild
Merged-In: Ieddaf859f568bc8ee486692474a4dec48b3d25e6
Change-Id: Iacbee67fa103279a9823bd26c559821b04849be6
(cherry picked from commit 6fb6cffce2)
 2021-03-12 05:06:48 +00:00
Julien Desprez
3f4e7a10a6 Remove the robolectric heuristic out of java_test 
Test: presubmit
Bug: 180736967
Change-Id: I65193d1639088149d8c2f1d5b7d4311e9f69a609
 2021-03-12 03:41:21 +00:00
Treehugger Robot
7d006a3d19 Merge changes I0ad54aa7,I1d6d20ec am: d13e31a8cc am: bb80dcb022 am: 76084edf9b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1627540

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I15a228eaab09245c8493f3931ca6ef6d45059a0e
 2021-03-12 03:15:37 +00:00
Treehugger Robot
76084edf9b Merge changes I0ad54aa7,I1d6d20ec am: d13e31a8cc am: bb80dcb022 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1627540

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85d88f246d77e2a125444e84d309aae16dc9acfd
 2021-03-12 02:29:40 +00:00
Treehugger Robot
d13e31a8cc Merge changes I0ad54aa7,I1d6d20ec 
* changes:
  Propagate LANG environment variable to lint in RBE
  Default lint RBE to local exec strategy
 2021-03-12 01:11:49 +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