StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,305 Commits 1 Branch 0 Tags
7102bb1c4750fd4594cfaeb2caf61fcbe06c4e8b
Commit Graph

42305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Duffin
7102bb1c47 Use java_sdk_library in bootclasspath_fragment contents as stubs am: 34827d4c0e am: e48bebd77d am: 735c0a088c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707567

Change-Id: Ia904dca2a2dcb866db1f25412479273d686b0169
 2021-05-14 07:35:22 +00:00
Paul Duffin
37f80999a2 Validate monolithic and modular hidden API flags are consistent am: dfa1083fee am: 02618f854e am: 10e912e02f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1705309

Change-Id: I65c4a0ac5e3c3b4ee701efc7c8ba28b7ebe7e344
 2021-05-14 07:35:16 +00:00
Paul Duffin
7a73beac0e Generate hidden API flags for a bootclasspath_fragment am: 2fef136885 am: c23b7e4d5b am: d66a44fe65 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1705308

Change-Id: I8179467fb3a1d1280e872b843b6faa326e435ce0
 2021-05-14 07:35:02 +00:00
Paul Duffin
735c0a088c Use java_sdk_library in bootclasspath_fragment contents as stubs am: 34827d4c0e am: e48bebd77d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707567

Change-Id: Ic590746d95d388c3f5a8df719d57c4587f731c2a
 2021-05-14 07:16:52 +00:00
Paul Duffin
10e912e02f Validate monolithic and modular hidden API flags are consistent am: dfa1083fee am: 02618f854e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1705309

Change-Id: Ia3dda5851254696de493d3542e0a331c30cfc927
 2021-05-14 07:16:47 +00:00
Paul Duffin
d66a44fe65 Generate hidden API flags for a bootclasspath_fragment am: 2fef136885 am: c23b7e4d5b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1705308

Change-Id: I6a5f1667db83ce176179b520621eb47b074d326b
 2021-05-14 07:16:35 +00:00
Paul Duffin
e48bebd77d Use java_sdk_library in bootclasspath_fragment contents as stubs am: 34827d4c0e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707567

Change-Id: Ie666d52edb78080becf91b2976c2e37420a591ad
 2021-05-14 06:53:23 +00:00
Paul Duffin
02618f854e Validate monolithic and modular hidden API flags are consistent am: dfa1083fee 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1705309

Change-Id: I06e9d4f6235fb05a15ea86f132ac740a2e973c27
 2021-05-14 06:53:17 +00:00
Paul Duffin
c23b7e4d5b Generate hidden API flags for a bootclasspath_fragment am: 2fef136885 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1705308

Change-Id: I1366239380164141b6c4b8ccb3eba7955704421e
 2021-05-14 06:46:56 +00:00
Paul Duffin
a4ec850482 Populate hiddenAPI structure even when not active am: 001e606e5c am: 251bb0cfaf am: e3ab70f204 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707568

Change-Id: I46a78147495fa7455fa3c4b2ecd9a390cddb7466
 2021-05-14 06:42:43 +00:00
Paul Duffin
10141eb0ba Disallow shared libraries in bootclasspath_fragment contents am: f4600f6e6a am: 5afc79746a am: d642862dcb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707566

Change-Id: I875ebabe9cf05b0cdd854021b9e770adc6e6bbb0
 2021-05-14 06:42:40 +00:00
Paul Duffin
e3ab70f204 Populate hiddenAPI structure even when not active am: 001e606e5c am: 251bb0cfaf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707568

Change-Id: Ie16eb49bc6a0f51da5f143f0ce8dbb1cc8d7b8b8
 2021-05-14 06:25:21 +00:00
Paul Duffin
d642862dcb Disallow shared libraries in bootclasspath_fragment contents am: f4600f6e6a am: 5afc79746a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707566

Change-Id: I70daf119a679f01ac216b482fa95f6b21c1a64da
 2021-05-14 06:25:17 +00:00
Paul Duffin
251bb0cfaf Populate hiddenAPI structure even when not active am: 001e606e5c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707568

Change-Id: I019e147931b2bbaacfc538df5ba3ce6e019464c2
 2021-05-14 06:11:16 +00:00
Paul Duffin
5afc79746a Disallow shared libraries in bootclasspath_fragment contents am: f4600f6e6a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707566

Change-Id: I91d1e97f0eaeafa6d9feca9d5c478b7dc643dc4f
 2021-05-14 06:10:37 +00:00
Paul Duffin
34827d4c0e Use java_sdk_library in bootclasspath_fragment contents as stubs 
A java_sdk_library specified in the bootclasspath_fragment contents
must be providing APIs for the bootclasspath_fragment and so must be
treated as if they were specified in the stub_libs. This avoids having
to specify them in both contents and stub_libs.

Bug: 179354495
Test: m nothing
Change-Id: I535065ee1a79b439e2676f35e06a75d4626adcaf
 2021-05-14 01:49:19 +01:00
Paul Duffin
dfa1083fee Validate monolithic and modular hidden API flags are consistent 
This makes sure that where there is overlap between the hidden API
flags generated for a module and the monolithic flags that they are
identical. That ensures that the modular hidden API flags will be
compatible with previous releases that relied on the monolithic flags.

Bug: 179354495
Test: m out/soong/.intermediates/art/build/boot/art-bootclasspath-fragment/android_common_apex10000/modular-hiddenapi/all-flags.csv
      m out/soong/hiddenapi/hiddenapi-flags.csv
      - Create some inconsistencies between the above two files.
      m out/soong/hiddenapi/hiddenapi-flags.csv.valid
Change-Id: Iaf9e23cef63e221608955d89dc8d496bcc70c86e
 2021-05-14 01:49:19 +01:00
Paul Duffin
2fef136885 Generate hidden API flags for a bootclasspath_fragment 
This change adds support for generating the hidden API flags for the
contents of a bootclasspath_fragment. Currently, it will only work for
the art-bootclasspath-fragment as it has no support for creating
dependencies between bootclasspath_fragment modules which will be
needed for handling any other bootclasspath_fragment.

The hidden API flag generation added by this change is completely
separate to the normal hidden API processing and is not as yet encoded
in dex jars so will have no effect on the runtime.

The generated files are provided for use by other modules and copied
into the sdk snapshot. That is needed to allow the build to verify that
the hidden API flags generated by the individual bootclasspath_fragment
modules are consistent with the flags generated for the whole
bootclasspath, whether building from source or prebuilts.

Bug: 179354495
Test: m art-module-sdk
      m out/soong/.intermediates/art/build/boot/art-bootclasspath-fragment/android_common_apex10000/modular-hiddenapi/all-flags.csv
      m out/soong/hiddenapi/hiddenapi-flags.csv
      - test that the former file is a subset of the latter and that
        where they overlap they are identical.
Change-Id: Ie27303e2960953db1b7abe95510e3bca4411b09a
 2021-05-14 01:48:51 +01:00
Paul Duffin
001e606e5c Populate hiddenAPI structure even when not active 
The modular hidden API processing needs access to the classesJarPaths
and bootDexJarPath fields of the hiddenAPI structure even if the
modules are not themselves considered to be active participants in the
existing hidden API processing.

This change moves the initialization of those fields to before inactive
modules are ignored.

Bug: 179354495
Test: m art-module-sdk out/soong/hiddenapi/hiddenapi-flags.csv
Change-Id: I06f96d39d0b413295d3e2af50453ebe7e4d3e9c8
 2021-05-14 01:45:42 +01:00
Yuntao Xu
3cf22ccb31 Merge "syntax check to jacoco filters for any build" am: 0589914135 am: 6b968b9531 am: f2f04e4160 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1706576

Change-Id: I6a95529702279a50c095c423f2052b2f5ce01b21
 2021-05-14 00:16:14 +00:00
Yuntao Xu
f2f04e4160 Merge "syntax check to jacoco filters for any build" am: 0589914135 am: 6b968b9531 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1706576

Change-Id: Iaceecc8c587231aa3bed8b7f661c1ebfc2abc8df
 2021-05-13 23:59:44 +00:00
Yuntao Xu
6b968b9531 Merge "syntax check to jacoco filters for any build" am: 0589914135 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1706576

Change-Id: I2fb69092310540ef9029fe76075a3b6098ec3070
 2021-05-13 23:44:58 +00:00
Paul Duffin
f4600f6e6a Disallow shared libraries in bootclasspath_fragment contents 
Bug: 177892522
Test: m nothing
Change-Id: I78c8ef8664ec1eb0fe3456a2de2cb956162ca0da
 2021-05-14 00:39:24 +01:00
Treehugger Robot
0290f6e772 Merge "Soong: check if lndk is needed for apex build" am: ef0439d969 am: 2a4deaaf6d am: 7a89365bc1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1705069

Change-Id: Iaf8d854ab9548591698c1e8240a26124d904a268
 2021-05-13 23:23:58 +00:00
Paul Duffin
f3042faefe Add java_sdk_library in bootclasspath_fragment contents to sdk am: a10bd3c127 am: 94a452c768 am: 58fcebb1a7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1705470

Change-Id: I673fd870c37f11966c4914c033ab8f96b8ece825
 2021-05-13 23:23:42 +00:00
Treehugger Robot
7a89365bc1 Merge "Soong: check if lndk is needed for apex build" am: ef0439d969 am: 2a4deaaf6d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1705069

Change-Id: Ifc23f4e83420bf639556589d6ba3d4dbc04c778a
 2021-05-13 23:15:02 +00:00
Yuntao Xu
0589914135 Merge "syntax check to jacoco filters for any build" 2021-05-13 23:11:48 +00:00
Paul Duffin
58fcebb1a7 Add java_sdk_library in bootclasspath_fragment contents to sdk am: a10bd3c127 am: 94a452c768 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1705470

Change-Id: I611119b71b2087c37250968024278ce938cfe04a
 2021-05-13 23:05:14 +00:00
Treehugger Robot
2a4deaaf6d Merge "Soong: check if lndk is needed for apex build" am: ef0439d969 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1705069

Change-Id: I6155c3404d7b125f84eed05299c16c09da6fca7c
 2021-05-13 23:05:05 +00:00
Treehugger Robot
ef0439d969 Merge "Soong: check if lndk is needed for apex build" 2021-05-13 22:49:39 +00:00
Paul Duffin
94a452c768 Add java_sdk_library in bootclasspath_fragment contents to sdk am: a10bd3c127 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1705470

Change-Id: I03dcf4b107c2cd390f6f90ce930bfbf007c147b2
 2021-05-13 22:42:06 +00:00
Zhijun He
ec2858799b Soong: check if lndk is needed for apex build 
This is to fix the unnecessary dependencies inclusion
when building apex modules.

Test: Build
Bug: 186306595
Change-Id: I1f3bbdb0a1f97a8338b45ca29c92acf9b20eadd3
 2021-05-13 14:04:45 -07:00
Paul Duffin
011d8e670c Merge "Add support for converting OptionalPath to Paths" am: 17ccf26748 am: 1d579e9694 am: 472325bf8d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1706747

Change-Id: I60d5cdc9e77ed68e9c365986057608649eee770b
 2021-05-13 20:31:13 +00:00
Paul Duffin
a10bd3c127 Add java_sdk_library in bootclasspath_fragment contents to sdk 
A java_library specified in a bootclasspath_fragment's contents
property will be automatically added to the sdk containing that
bootclasspath_fragment. Previously, if that was attempted with a
java_sdk_library it would be added to the sdk as if it was a normal
java_boot_libs which would prevent the sdk from containing the
API specific artifact such as current.txt files and stub libraries
and sources.

This change fixes that and adds a java_sdk_library as a java_sdk_libs
module.

Bug: 177892522
Test: m nothing
Change-Id: Ided57b846ce5b8940c7e898c786fd77602582ea2
 2021-05-13 21:25:42 +01:00
Paul Duffin
472325bf8d Merge "Add support for converting OptionalPath to Paths" am: 17ccf26748 am: 1d579e9694 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1706747

Change-Id: I1a6c2831ce84fe2f85322bf2baae0c17fcc970c8
 2021-05-13 20:10:12 +00:00
Paul Duffin
1d579e9694 Merge "Add support for converting OptionalPath to Paths" am: 17ccf26748 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1706747

Change-Id: I9605a7479b974ef369de702ededb84a3ba0c1f37
 2021-05-13 19:51:55 +00:00
Yuntao Xu
5b009aedf9 syntax check to jacoco filters for any build 
Perform syntax check to jacoco filters for any build.

Bug: 183622051
Test: Manual
Test: TreeHugger
Change-Id: Iff90d7b45bdad8706c43c7e16d98270af688d20b
 2021-05-13 12:42:24 -07:00
Paul Duffin
17ccf26748 Merge "Add support for converting OptionalPath to Paths" 2021-05-13 19:33:09 +00:00
Paul Duffin
39ca8223ae Merge "Build boot images in bootclasspath_fragment/platform_bootclasspath" am: 4bbf45faef am: 748d954062 am: 57610650d1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690884

Change-Id: I314c01f74f2fe58576d66c1979a1d1ca14f5cad6
 2021-05-13 17:09:17 +00:00
Treehugger Robot
648d0fab59 Merge "Add support for SOONG_SDK_SNAPSHOT_USE_SRCJAR" am: 820397deb2 am: 66f9ac0d33 am: c0de64161c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1706107

Change-Id: I69d8f0ed2459d8722c620d3a9984363318fd5ec2
 2021-05-13 17:09:10 +00:00
Paul Duffin
57610650d1 Merge "Build boot images in bootclasspath_fragment/platform_bootclasspath" am: 4bbf45faef am: 748d954062 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690884

Change-Id: Ifa764af1894637846631c9aba05128f7f307df0d
 2021-05-13 16:52:54 +00:00
Treehugger Robot
c0de64161c Merge "Add support for SOONG_SDK_SNAPSHOT_USE_SRCJAR" am: 820397deb2 am: 66f9ac0d33 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1706107

Change-Id: Id4649acc8899ce6a25fbcdc16fc6c688fa9f4f73
 2021-05-13 16:52:37 +00:00
Paul Duffin
748d954062 Merge "Build boot images in bootclasspath_fragment/platform_bootclasspath" am: 4bbf45faef 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690884

Change-Id: I455bd7455192bd6f6ac392d6932310f116038d57
 2021-05-13 16:52:11 +00:00
Paul Duffin
4bbf45faef Merge "Build boot images in bootclasspath_fragment/platform_bootclasspath" 2021-05-13 16:32:23 +00:00
Treehugger Robot
66f9ac0d33 Merge "Add support for SOONG_SDK_SNAPSHOT_USE_SRCJAR" am: 820397deb2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1706107

Change-Id: I987da5cdbad7e165251a4fbf1524cd9de77e676a
 2021-05-13 16:23:33 +00:00
Treehugger Robot
820397deb2 Merge "Add support for SOONG_SDK_SNAPSHOT_USE_SRCJAR" 2021-05-13 16:00:40 +00:00
Paul Duffin
da21f0e88c Merge "Separate storing config for MakeVars from building boot image" am: f356e5a533 am: eb18e84459 am: 443d6ab74b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690882

Change-Id: I3c09cc7cc1c1b56db2e9e806134472863f6a8f19
 2021-05-13 14:53:59 +00:00
Paul Duffin
9be4c306eb Merge "Make hidden API bootclasspath_fragment test more realistic" am: 7dbfe7c4ee am: c088ab8e01 am: 6f48659cbb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1706746

Change-Id: Ie019ddc2d1d9778abad4cafc753f4f23649fcac7
 2021-05-13 14:53:36 +00:00
Paul Duffin
443d6ab74b Merge "Separate storing config for MakeVars from building boot image" am: f356e5a533 am: eb18e84459 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690882

Change-Id: I13f7019e51915305453cc9c5da4cb6c7cc393a71
 2021-05-13 14:36:55 +00:00
Paul Duffin
6f48659cbb Merge "Make hidden API bootclasspath_fragment test more realistic" am: 7dbfe7c4ee am: c088ab8e01 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1706746

Change-Id: I764e40e3c629d93f717069dd2936159d1bf5fc34
 2021-05-13 14:36:49 +00:00