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
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
Julien Desprez
a0ad77e293
Merge "Revert "Revert "Attempt to run all java_test_host that look unit..."" am: b1778a42cb
am: 77294d573e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621859
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifd83baecee3bd7c1a608a249a9e97e7bbb1b389d
2021-03-06 03:40:52 +00:00
Julien Desprez
b1778a42cb
Merge "Revert "Revert "Attempt to run all java_test_host that look unit...""
2021-03-06 02:40:44 +00:00
Colin Cross
0f3c4a986f
Merge "Exempt framework-res from UseApiFingerprint" am: cd2df5dec6
am: 7b91027296
am: 7cbf691298
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621782
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I62924192c491a557ede95513aa9830b13031818e
2021-03-06 01:23:12 +00:00
Colin Cross
821790d373
Merge changes from topic "lint_repackage" am: 3903d401d0
am: 9c574a8575
am: 0a0763a8a7
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1619574
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2725e512318cb3a9f19abab82b11e394e639c3ee
2021-03-06 01:22:56 +00:00
Colin Cross
7cbf691298
Merge "Exempt framework-res from UseApiFingerprint" am: cd2df5dec6
am: 7b91027296
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621782
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3069018a92d5cad99f59cd7db008c02025e7c8bc
2021-03-06 00:58:32 +00:00
Colin Cross
0a0763a8a7
Merge changes from topic "lint_repackage" am: 3903d401d0
am: 9c574a8575
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1619574
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7576f269f572f458aa854e34e952b72a6cac7e97
2021-03-06 00:58:14 +00:00
Colin Cross
cd2df5dec6
Merge "Exempt framework-res from UseApiFingerprint"
2021-03-05 23:34:37 +00:00
Colin Cross
3903d401d0
Merge changes from topic "lint_repackage"
...
* changes:
Remove lint outputs to prevent showing old lint results on error
Make common dependencies of lint use restat
Use repackaged lint binary
2021-03-05 23:34:14 +00:00
Jaewoong Jung
42688a9945
Merge "Clear remains of java.Dependency interface." am: 083e6cd267
am: a021326e92
am: d9119bc38f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620201
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0be2ce1f1eda8b6a15f296899079bb70d04f7f2a
2021-03-05 23:19:07 +00:00
Jaewoong Jung
d9119bc38f
Merge "Clear remains of java.Dependency interface." am: 083e6cd267
am: a021326e92
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620201
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id792437df796baa03e9f02fb24c9263342658edf
2021-03-05 22:35:34 +00:00
Colin Cross
382ba06c27
Pass ANDROID_SDK_HOME to metalava so it doesn't write to ~/.android
...
Give metalava an ANDROID_SDK_HOME directory in the out tree so it
doesn't write to ~/.android.
Bug: 181908035
Test: mv ~/.android ~/.android.bak && m car-doc-stubs
Change-Id: I63064ece62ff4aa1eb93cbb6c9e33038c1e8a19d
2021-03-05 14:01:44 -08:00
Paul Duffin
eaadd67a99
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
Change-Id: Ieddaf859f568bc8ee486692474a4dec48b3d25e6
Merged-In: I15e5a6c2f07e73718803501d705de0d7ab9bec90
Merged-In: Ib084ee6676d4a201f4b60533221036245d3be759
Merged-In: I629ed1454def5cf8164a6079034e2c610ed0a554
Merged-In: Ia7613f35c4392eac51c94b0d1da29ecac82eb103
2021-03-05 21:29:41 +00:00
Colin Cross
2669e7edf0
Exempt framework-res from UseApiFingerprint
...
Generating the API fingerpring depends on framework-res, so the
fingerprint cannot be embedded into framework-res. Hardcode an
exemption to UseApiFingerprint.
Bug: 181978889
Test: TARGET_BUILD_VARIANT=user UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT=true vendor/google/build/build_mainline_modules.sh
Change-Id: I621f36d5eb157dd97baa132ff109b4df791eedcc
2021-03-05 19:54:31 +00:00
Colin Cross
2787e8e65e
Support robolectric prebuilts in android_robolectric_test
...
The version of robolectric in external/robolectric-shadows is based
on 4.1 and is difficult to update. Support using the prebuilt versions
in prebuilts/misc/common/robolectric, with the caveat that they won't
support the in-progress SDK version.
Bug: 181886851
Test: manual
Change-Id: Ie3a861cf6d637f97cf00212c02322f92c1043f0a
2021-03-05 19:22:30 +00:00
Colin Cross
31972dc487
Support remoting lint commands with RBE
...
Bug: 181681346
Bug: 181912787
Test: m USE_RBE=true RBE_LINT=true lint-check
Change-Id: I10596c40dc5e29075ba0cab51ea9a98cc58b3188
2021-03-05 11:13:40 -08:00