Commit Graph

3265 Commits

Author SHA1 Message Date
Liz Kammer
fd84d991dc Merge "Make hiddenapi use prebuilt stubs when it should" am: 9d1f85da7a am: 11719185e2 am: 4bc86bdb72 am: f289c2a0ae am: 6fef26413b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1431533

Change-Id: Id8da02afdb4563b654425d3687169ef10da0987d
2020-09-21 17:19:03 +00:00
Anton Hansson
a2adc37fc9 Make hiddenapi use prebuilt stubs when it should
Bug: 160455085
Test: build_unbundled_mainline_module.sh (with disabled source-stubs)
Test: hiddenapi_singleton_test.go
Change-Id: Id93c974351b3f8efdf8e4efe4192d3809f4fcaa5
2020-09-18 08:06:58 -07:00
Anton Hansson
7da8a66865 Merge "Make API lint warnings errors for system & testapi" 2020-09-17 10:47:21 +00:00
Treehugger Robot
214052bbcf Merge "Make robolectric runtimes a host module" am: 0fe609075d am: a53a783a13 am: 1a24371349 am: 825733a01e am: 853a7d4f62
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1427453

Change-Id: I55a1ba4b856e98b62ffe026fb2849575f9d2d337
2020-09-17 02:30:30 +00:00
Treehugger Robot
0fe609075d Merge "Make robolectric runtimes a host module" 2020-09-16 23:23:08 +00:00
Anton Hansson
2d4673005d Make API lint warnings errors for system & testapi
They used to be listed to not have this treatment, but we are
baselining the existing warnings and making them errors instead.

Bug: 154317059
Test: m
Change-Id: I306b5a07d1b771cc0061aaac44f881f40fbe85ed
2020-09-16 13:17:12 +01:00
Colin Cross
5aa29a7fc2 Make robolectric runtimes a host module
I931f9145f1ced21a9f86d647cfbb6d2b645b4f18 made robolectric_android-all-stub
empty, breaking running robolectric tests packaged by Soong.
To enable using robolectric-host-android_all instead, make the
runtimes module a host module.

Also remove the empty robolectric_android-all-stub dependency.

Test: m checkbuild
Change-Id: Idc158d84fd8b6d98d824a6bdc8be297ac43ec2f2
2020-09-15 11:26:12 -07:00
Liz Kammer
57415af1ab Merge "Updates checkapi filename properties behavior" am: 6b5430203c am: 0ae6ce2b99 am: 7aa68f1849 am: a88f455e29 am: ac672f52aa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1417208

Change-Id: I9b2be533623e05a21eab28f930277a01da1271e0
2020-09-14 22:43:52 +00:00
Liz Kammer
e9b1e91ec3 Merge "Add hidden_api for java_import" am: 88d593d942 am: 00daa76535 am: 5fb368c484 am: eb0e1f2561 am: 52664dac4c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418668

Change-Id: Id4a9a2a1db9da201a3a29024e132ac6aeef3fba2
2020-09-14 22:43:19 +00:00
Ulyana Trafimovich
118b445c67 Merge changes from topic "uses-libs-21" am: 2fc25bbd4c am: de2b311e0c am: c366bdea5a am: a0f87740a9 am: 10c3b84113
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1424793

Change-Id: Iaa26b9db6965a22f3381d96f95c98ac9dafaa866
2020-09-14 19:41:06 +00:00
Liz Kammer
6b5430203c Merge "Updates checkapi filename properties behavior" 2020-09-14 17:55:17 +00:00
Liz Kammer
88d593d942 Merge "Add hidden_api for java_import" 2020-09-14 13:57:09 +00:00
Ulyana Trafimovich
2fc25bbd4c Merge changes from topic "uses-libs-21"
* changes:
  Treat "org.apache.http.legacy" as optional <uses-library> by default.
  Consistently use default install path for compatibility <uses-library>.
2020-09-14 09:18:39 +00:00
Treehugger Robot
3d7e0993fb Merge "Remove framework-modules naming scheme" am: 570b81ab01 am: 280f17c4be am: 18bb8a92e5 am: 291c5e2b59 am: f66eb0d277
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1425729

Change-Id: I0fc78f96c8b2991e0ba4a1e8ae5c6b2f0e1816a3
2020-09-12 00:14:07 +00:00
Treehugger Robot
1a96443085 Merge "Add support for building with R8 full mode" am: b900066dab am: f84b6b4f89 am: 4198dc431f am: b4308c8e62 am: 47a542c0fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1408707

Change-Id: Ia0bb49244c0bebbb8e9820d011f080b1d3879a6b
2020-09-12 00:02:05 +00:00
Treehugger Robot
1c93a4d74a Merge "Revert "Revert "Remove create_stubs and checkapi from droiddoc""" am: b8e35ca4a4 am: 57d6fe4a8c am: 0cd65aef49 am: 06778bade1 am: b78d2a30fa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1424568

Change-Id: Ib6143b28fa4bde35efaa7976b53aeb45b31ea2fc
2020-09-11 23:45:30 +00:00
Treehugger Robot
570b81ab01 Merge "Remove framework-modules naming scheme" 2020-09-11 19:58:16 +00:00
Paul Duffin
ee9ad5d526 Remove framework-modules naming scheme
The naming_scheme property was not removed as it may be useful for
future when migrating to java_sdk_library.

Bug: 168301990
Test: m nothing
Change-Id: Ie97dd60355a207f1312a2dd910f1fb25b46fd737
2020-09-11 16:09:15 +01:00
Liz Kammer
9ed7915f01 Updates checkapi filename properties behavior
Previously Api_filename and Removed_api_filename were treated as
booleans based on whether they were non-empty, the supplied filenames
are used.

Test: go tests
Test: m
Bug: 143135631

Change-Id: I72c86eaf3b314eb2eb3afd0b2acf7d4b102ddb03
2020-09-11 07:49:45 -07:00
Ulya Trafimovich
663dc53c94 Consistently use default install path for compatibility <uses-library>.
Previously default install path was provided only for comatibility
libraries that are added explicitly via `uses_libs`/`optional_uses_libs`
properties. This didn't take into account compatibility libraries that
are added by Soong when it computes transitive closure of SDK library
dependencies. As a result, install path in such cases remained unknown,
and the corresponding compatibility library was omitted from class
loader context, which caused 'ClassLoaderContext shared library size
mismatch' errors at first boot on device.

Test: lunch aosp_cf_x86_phone-userdebug && m
Bug: 132357300
Change-Id: If661272f46803299c8640f7f5ef161c8217d07e4
2020-09-11 11:31:22 +01:00
Treehugger Robot
b900066dab Merge "Add support for building with R8 full mode" 2020-09-10 22:41:42 +00:00
Treehugger Robot
b8e35ca4a4 Merge "Revert "Revert "Remove create_stubs and checkapi from droiddoc""" 2020-09-10 20:52:55 +00:00
Christoffer Quist Adamsen
f2d7b16dd6 Add support for building with R8 full mode
Change-Id: Ibb6fd64e8901cb4311b29b3bbb266ec8fd1835c9
Test: make external/libtextclassifier
2020-09-10 21:24:57 +02:00
Ulyana Trafimovich
b27d3a596e Merge "Replace is_uses_lib property with provides_uses_lib." am: 79a94a27b6 am: df9afcd9b6 am: c2c40cdbc5 am: ccdc6e74bd am: f31eb25bb6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1423137

Change-Id: Id402ab7da678c11c0d270df8af870819340cd24e
2020-09-10 18:28:21 +00:00
Xin Li
80dc4f137a Merge "Merge Android R" 2020-09-10 17:22:09 +00:00
Liz Kammer
e1ab250ec8 Revert "Revert "Remove create_stubs and checkapi from droiddoc""
This reverts commit 3666c7023f.

Reason for revert: This was originally reverted because it caused a breakage (b/167405890) in a branch that is no longer relevant.

Change-Id: I81063cd47b816b5b3c0ab8427432730d6b881a3f
2020-09-10 15:29:25 +00:00
Ulyana Trafimovich
df9afcd9b6 Merge "Replace is_uses_lib property with provides_uses_lib." am: 79a94a27b6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1423137

Change-Id: I22b08e951667d14b03a52b091ae34ebb885d5fd9
2020-09-10 14:58:14 +00:00
Liz Kammer
5ca3a6293e Add hidden_api for java_import
Test: go java tests
Test: m
Bug: 160455085
Change-Id: Ib6e826e32ca73ceea0799b26145ad06b1e62a1bf
2020-09-10 07:56:03 -07:00
Ulyana Trafimovich
79a94a27b6 Merge "Replace is_uses_lib property with provides_uses_lib." 2020-09-10 14:34:20 +00:00
Kousik Kumar
c10fd9d1c6 Merge "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c am: f15ed4fe61 am: 4ed93ef2d6 am: 330184504b am: 08db7c4b37
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1419252

Change-Id: I02fffd8b3b85a9fb4d0d4f6e314c7e287d3b8360
2020-09-10 11:17:24 +00:00
Kousik Kumar
f15ed4fe61 Merge "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1419252

Change-Id: I52b7a3810fdf3314ae107f4b8330e9d6f62c6302
2020-09-10 09:50:35 +00:00
Ulya Trafimovich
54027b572e Replace is_uses_lib property with provides_uses_lib.
The previous property was boolean-valued and provided only the
information whether the library should be treated as <uses-library>
by Soong. The new property is an optional string, which is the name of
the <uses-library>. The name can be different from the module name, as
in the case of "qcrilhook" module which provides <uses-library>
"com.qualcomm.qcrilhook".

Test: lunch aosp_cf_x86_phone-userdebug && m
Bug: 132357300
Change-Id: I65b68e6f7c420ab9c443a76de4c917d31fcd8c8f
2020-09-10 10:47:41 +01:00
Kousik Kumar
3e0b9c031c Merge "Check UseRBE is set before replacing any template with the RE version." 2020-09-10 09:24:17 +00:00
kellyhung
35fb1bea5c Add test_mainline_module option. am: 74b00521f8 am: af286f3312 am: dfde06a662 am: bf3f14866b am: a3e7f8354c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1402513

Change-Id: I423820f6df732c2f56bac6aeb538c24de21fb300
2020-09-09 09:59:47 +00:00
kellyhung
af286f3312 Add test_mainline_module option. am: 74b00521f8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1402513

Change-Id: I4824247226e786363cf94815576a93da3deb73da
2020-09-09 08:06:35 +00:00
kellyhung
74b00521f8 Add test_mainline_module option.
Bug: 165425972

Test: m HelloWorldTests
Change-Id: I6e60b3895328c4f7aef0bfb30dcdefc30ee1d8ed
2020-09-09 02:15:39 +00:00
Treehugger Robot
b2154d0d0e Merge "Don't assume host arch is always x86" am: daf735287b am: 9ef1f7d96a am: b2cf8359ea am: 29bd18fd53 am: 6fd5f554a0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1415953

Change-Id: I78cd55d31788e011c276cb7eb5b246d981effbca
2020-09-09 01:45:49 +00:00
Treehugger Robot
9ef1f7d96a Merge "Don't assume host arch is always x86" am: daf735287b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1415953

Change-Id: I049556891890833c1e7db6483e5ee6446714583e
2020-09-09 00:32:18 +00:00
Treehugger Robot
daf735287b Merge "Don't assume host arch is always x86" 2020-09-09 00:13:50 +00:00
Ulyana Trafimovich
b69b325e74 Merge "Be more strict about unknown install <uses-library> paths." am: 117a5ef307 am: 0f13eff149 am: 84ed91df7d am: 21055b580d am: 9c8aa68ae3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418529

Change-Id: Idbe77ed42ac4bfcb8365357042fada4b6615caf2
2020-09-08 16:59:43 +00:00
Ulyana Trafimovich
0f13eff149 Merge "Be more strict about unknown install <uses-library> paths." am: 117a5ef307
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418529

Change-Id: Ib28e902e7f8ec57a15ef50692024cd37a96696bc
2020-09-08 15:34:50 +00:00
Jiyong Park
87788b5247 Don't assume host arch is always x86
This change fixes some places where host arch is assumed to be x86 to
form a path element like linux-x86. In preparation for non-x86 host
targets, the host arch part is derived from the context.

In addition, InstallForceOS() is refactored so that it can override not
only OsType, but also ArchType. Without this, the paths for the
robolectic modules will be changed from linux-x86 to linux-common, which
breaks several other places where the old paths are expected.

Bug: 134795810
Test: m
Change-Id: Ib38c715948ae546e55021ece82bac1d82e9e5da0
2020-09-08 15:12:10 +09:00
Ulya Trafimovich
045e11ad0d Be more strict about unknown install <uses-library> paths.
Allow default install paths only for compatibility libraries. For other
libraries that are explicitly specified in `uses_libs` and
`optional_uses_libs` unknown install path should be an error.

Bug: 132357300
Test: lunch cf_x86_phone-userdebug && m
Change-Id: I2209c90a939a8aa46c42e13bb42d09c07e4d0895
2020-09-07 13:58:51 +01:00
Ulyana Trafimovich
f0436cd631 Merge "Allow non-SDK Java libraries to masquerade as <uses-library>." am: bb3467d297 am: 99bd329274 am: b55d73f706 am: 757989d5f9 am: 6e049dbc02
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1417188

Change-Id: I4014e430fc497d35aeedb9feca23ee22c183e8c3
2020-09-07 11:48:25 +00:00
Ulyana Trafimovich
99bd329274 Merge "Allow non-SDK Java libraries to masquerade as <uses-library>." am: bb3467d297
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1417188

Change-Id: If25aaa0174091e966cc5c6b16063b6486a7b4ab6
2020-09-07 10:23:53 +00:00
Ulyana Trafimovich
bb3467d297 Merge "Allow non-SDK Java libraries to masquerade as <uses-library>." 2020-09-07 09:49:07 +00:00
Treehugger Robot
e30fd7bbc5 Merge "Iterate <uses-library> in deterministic order in manifest_fixer." am: bfb98ece49 am: da55e8208f am: e124bd97d9 am: c375a20168 am: 872926034c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418533

Change-Id: Ife02350680a0cfc3196ccf3ff906e96b0aa96f84
2020-09-04 02:52:37 +00:00
Treehugger Robot
d7d3f824bc Merge "Add imports_compile_dex to prebuilt_apis" am: cda9a92efb am: 48e2acaf99 am: cc4fb483cb am: 93181d21fc am: 4d015fbed3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418868

Change-Id: I9b922ddb38108f46a9a537dd22ba7a49e5ec499c
2020-09-04 01:34:46 +00:00
Treehugger Robot
da55e8208f Merge "Iterate <uses-library> in deterministic order in manifest_fixer." am: bfb98ece49
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418533

Change-Id: I42df02457960f99d3257d131524d8005e2c7a97e
2020-09-04 01:17:25 +00:00
Treehugger Robot
bfb98ece49 Merge "Iterate <uses-library> in deterministic order in manifest_fixer." 2020-09-04 00:45:48 +00:00