Commit Graph

3968 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Colin Cross
068f33f6cf Merge changes from topic "lint_rbe"
* changes:
  Pass ANDROID_SDK_HOME to metalava so it doesn't write to ~/.android
  Support remoting lint commands with RBE
2021-03-10 18:13:31 +00:00
Colin Cross
ad22bc2995 Add comment to lintPaths
Test: none
Change-Id: Ia7db6e27fedd95df2ebfc573e35a44a93acb031b
2021-03-10 10:10:40 -08:00
Paul Duffin
95bdab4000 Support test fixtures in java package
Restructures the java package test setup code to create FixturePreparer
instances for setting up a test fixture and converts some tests to
use it.

The goal with this change is not to switch all the java tests over to
directly using the new model but instead to ensure that the majority of
the java tests run with the new model, to allow existing tests to
easily switch to the new model when needed and to allow dependent
packages to be switched to the new model.

Bug: 181070625
Test: m nothing
Change-Id: I1c9d96ddbc973aaf9733dcd7fa0479f79b0f471f
2021-03-10 10:13:09 +00:00
Nicolas Geoffray
a0acfa8b85 Merge "Reinstate the enforcement of stable core platform API usage" 2021-03-10 09:45:52 +00:00
Aaron Huang
d1a5432b9e Merge "Add service-connectivity-pre-jarjar to legacy core platform list" into sc-dev 2021-03-10 04:40:56 +00:00
Jaewoong Jung
1a97ee0b20 Populate baseline_file values.
Set baseline_file properties of droidstubs generated in sdk_libary.go to
incompatibilities modules auto-generated by prebuilt_api. This requires
prebuilt_api to generate the modules whether next_api_dir is set or not.

Test: TreeHugger
Bug: 180123247
Change-Id: I690604a8a54e9d9419f072a28a0c0e7734abbd85
2021-03-09 16:26:03 -08:00
Jaewoong Jung
1c1b6e6d95 Lineage properties support module references.
They should have had `android:"path"` tags attached so that users can
point them to filegroup modules.

Test: app_test.go & app_import_test.go
Bug: 182175153
Change-Id: I5580408488ffe5fc12c869cbfb7a468713dcbc96
2021-03-09 15:14:34 -08:00
Jaewoong Jung
f75649f692 Merge "Add additional_certificates to android_app_import." am: 05ebca4f7f am: 6ea8f69bc5 am: f10cb18a20
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622565

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba08d54ace799cb2a6dba7cc5983234fcee5f33f
2021-03-09 16:27:01 +00:00
Jaewoong Jung
f10cb18a20 Merge "Add additional_certificates to android_app_import." am: 05ebca4f7f am: 6ea8f69bc5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622565

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ccbc3abbfad8807ca00f4fd27a23d975483f6b3
2021-03-09 15:44:34 +00:00
Jaewoong Jung
05ebca4f7f Merge "Add additional_certificates to android_app_import." 2021-03-09 14:55:24 +00:00
Ulyana Trafimovich
c22f36a4db Merge "Disable verify_uses_libraries check if dexpreopt is globally disabled." am: 35570c14ce am: 3d7489c1e1 am: 6afbccdbc8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1615200

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id28e0bea7b5b114c8073fa8ebb289f29969b2968
2021-03-09 10:50:12 +00:00
Ulyana Trafimovich
6afbccdbc8 Merge "Disable verify_uses_libraries check if dexpreopt is globally disabled." am: 35570c14ce am: 3d7489c1e1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1615200

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4bc1508470878ca1cdefe4978854642001d029ab
2021-03-09 10:06:19 +00:00
Ulyana Trafimovich
35570c14ce Merge "Disable verify_uses_libraries check if dexpreopt is globally disabled." 2021-03-09 08:40:23 +00:00
Jaewoong Jung
25ae8dec91 Add additional_certificates to android_app_import.
Bug: 182175153
Test: app_import_test,go
Change-Id: I467e98065945b59dcc574a18144756edccdea441
2021-03-08 17:37:46 -08:00
Colin Cross
7b6db9b717 Merge "Support robolectric prebuilts in android_robolectric_test" am: 7314fedd37 am: d5e78d1c17 am: 6426ae5a73
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621781

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ac0e29ee43926bf07ba918a477dbef1389f643c
2021-03-08 20:15:13 +00:00
Colin Cross
6426ae5a73 Merge "Support robolectric prebuilts in android_robolectric_test" am: 7314fedd37 am: d5e78d1c17
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621781

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c3d6e50e5c3968da29ed1f88198a5545aef0ee9
2021-03-08 20:09:31 +00:00
Colin Cross
7314fedd37 Merge "Support robolectric prebuilts in android_robolectric_test" 2021-03-08 19:08:10 +00:00
Paul Duffin
8d74783b41 Merge "Clean up cc.RegisterRequiredBuildComponentsForTest()" am: 0805d4ebdd am: b6ae322278 am: 1f50ff0df6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621414

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22877e0de75fbb1f4899fad3081418acf3b6df74
2021-03-06 09:56:58 +00:00
Paul Duffin
1f50ff0df6 Merge "Clean up cc.RegisterRequiredBuildComponentsForTest()" am: 0805d4ebdd am: b6ae322278
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621414

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98e32ff064e2d6617387c55a9eb4d8e331d0d17b
2021-03-06 09:06:22 +00:00
Paul Duffin
0805d4ebdd Merge "Clean up cc.RegisterRequiredBuildComponentsForTest()" 2021-03-06 08:43:56 +00:00
Julien Desprez
ebd1d8cd52 Merge "Revert "Revert "Attempt to run all java_test_host that look unit..."" am: b1778a42cb am: 77294d573e am: a0ad77e293
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621859

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If41cf6170ff2403a1952589209ffcdaac329abe3
2021-03-06 04:21:50 +00:00