openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
42,399 Commits 2 Branches 1 Tag 34 MiB
Commit Graph

42399 Commits

Author SHA1 Message Date
Liz Kammer c2a739c9df Merge "Define a narrower context for getting arch props" am: 374623f91f am: f315fbeaa5 am: da4b4457b9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1708382

Change-Id: Ia67aa4f7cebba16a3159bb317270bd7a200d163f
 2021-05-14 22:15:54 +00:00
Liz Kammer da4b4457b9 Merge "Define a narrower context for getting arch props" am: 374623f91f am: f315fbeaa5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1708382

Change-Id: Idc0016d1677d350867c915de3705a160b6fe0851
 2021-05-14 21:57:18 +00:00
Liz Kammer f315fbeaa5 Merge "Define a narrower context for getting arch props" am: 374623f91f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1708382

Change-Id: Ie1c4f982f54d70f2c40ac3d7d48f0e28fd42dc05
 2021-05-14 21:41:16 +00:00
Liz Kammer 374623f91f Merge "Define a narrower context for getting arch props" 2021-05-14 21:26:29 +00:00
Paul Duffin 20042da220 Merge "Refactor special handling of hidden API encoding for master-art" am: fdd9743609 am: 1b5e8cdbee am: 23b34baa5c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707569

Change-Id: I5dbe8a4c4fc0f4e8a91ec9c04f32a7d71f96715e
 2021-05-14 19:52:52 +00:00
Paul Duffin 63472fe5ba Merge "Stop generating unnecessary hidden API rules" am: b7c78731d4 am: 97961f4837 am: d12106540b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707574

Change-Id: I592af32aa225403d5ba1d1a4c89dda84d3aad0ba
 2021-05-14 19:52:47 +00:00
Paul Duffin 7b07c01f20 Merge "Generate monolithic hidden API files direct from class jars" am: 21f62ef867 am: b28f562092 am: 8063427dc4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707573

Change-Id: I116c3a4028fd199df12ead373fbfb4d47c6fdf8e
 2021-05-14 19:52:42 +00:00
Paul Duffin f8b776e97f Merge "Dedup hidden API rule generation" am: 2bc8b3a646 am: 93b312c2dd am: 29c6e9fa55 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707572

Change-Id: I584f17bd5ee9092730d4e37c5b34233805dd6b1a
 2021-05-14 19:52:33 +00:00
Paul Duffin 23b34baa5c Merge "Refactor special handling of hidden API encoding for master-art" am: fdd9743609 am: 1b5e8cdbee 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707569

Change-Id: I49f3ee3a7bb0eb9f26440a278c5f1ec56a6037bf
 2021-05-14 19:33:34 +00:00
Paul Duffin d12106540b Merge "Stop generating unnecessary hidden API rules" am: b7c78731d4 am: 97961f4837 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707574

Change-Id: Ida624f82ac4394cad434a943271ecc64203fce26
 2021-05-14 19:33:28 +00:00
Paul Duffin 8063427dc4 Merge "Generate monolithic hidden API files direct from class jars" am: 21f62ef867 am: b28f562092 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707573

Change-Id: I64919be5a862620eb5077e6f18982e02eae8dcb4
 2021-05-14 19:33:23 +00:00
Paul Duffin 29c6e9fa55 Merge "Dedup hidden API rule generation" am: 2bc8b3a646 am: 93b312c2dd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707572

Change-Id: Ib9a86e05001db3571b1be5ebb851fa5aa63af044
 2021-05-14 19:33:15 +00:00
Paul Duffin 1b5e8cdbee Merge "Refactor special handling of hidden API encoding for master-art" am: fdd9743609 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707569

Change-Id: Id36a114acd7854164cc3eee2c99e1144372b9f64
 2021-05-14 19:18:41 +00:00
Paul Duffin 97961f4837 Merge "Stop generating unnecessary hidden API rules" am: b7c78731d4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707574

Change-Id: I96fab0709252e6c0730b5a22a06e8a02358653a3
 2021-05-14 19:18:34 +00:00
Paul Duffin b28f562092 Merge "Generate monolithic hidden API files direct from class jars" am: 21f62ef867 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707573

Change-Id: I19deb2643cc128ca9f25d38152db864fdc0fe199
 2021-05-14 19:18:27 +00:00
Paul Duffin 93b312c2dd Merge "Dedup hidden API rule generation" am: 2bc8b3a646 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707572

Change-Id: I7d9edfc6383ba6efbc62714c12aa415cb9a45cfd
 2021-05-14 19:17:11 +00:00
Liz Kammer b6dbc87c97 Define a narrower context for getting arch props 
go best practices recommend defining an interface where it is used and
limiting the scope

Test: go test soong tests
Change-Id: I96293ba594d37360b1a8910161477133d4aafdd9
 2021-05-14 15:14:40 -04:00
Paul Duffin fdd9743609 Merge "Refactor special handling of hidden API encoding for master-art" 2021-05-14 18:53:43 +00:00
Paul Duffin b7c78731d4 Merge "Stop generating unnecessary hidden API rules" 2021-05-14 18:53:08 +00:00
Paul Duffin 21f62ef867 Merge "Generate monolithic hidden API files direct from class jars" 2021-05-14 18:52:11 +00:00
Paul Duffin 2bc8b3a646 Merge "Dedup hidden API rule generation" 2021-05-14 18:51:10 +00:00
Paul Duffin 1b3dbb7c7d Merge "Allow shared libraries on bootclasspath" am: b0f20d134f am: 42a9a2ede6 am: 8a9a8ffd2f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707576

Change-Id: I5d9603841e7dd422bcd18e45249556918f724fcc
 2021-05-14 18:21:45 +00:00
Bill Peckham a7eec840cc Merge "Fix missing headers for vndk snapshotted libc" am: 054619d198 am: a1ae5530cb am: 94f308c04a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1708168

Change-Id: I7aa49e3be1ca027ef6a16c8cd3c1b378eb512575
 2021-05-14 18:21:23 +00:00
Colin Cross 25c60df217 Merge "Add order-only dependency on shared libraries" am: 9debc21ca3 am: 78894a5ab0 am: 690de6069b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707986

Change-Id: Id03071cc3809d0c4212839f6be3fec547ae3a61c
 2021-05-14 18:19:52 +00:00
Paul Duffin 8a9a8ffd2f Merge "Allow shared libraries on bootclasspath" am: b0f20d134f am: 42a9a2ede6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707576

Change-Id: I96dcd94c06aa2cbf12fbf4e0effb708d26658ccb
 2021-05-14 17:51:21 +00:00
Bill Peckham 94f308c04a Merge "Fix missing headers for vndk snapshotted libc" am: 054619d198 am: a1ae5530cb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1708168

Change-Id: I5eac5b7651afc447f706067f9f2dfe47508d2278
 2021-05-14 17:50:58 +00:00
Colin Cross 690de6069b Merge "Add order-only dependency on shared libraries" am: 9debc21ca3 am: 78894a5ab0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707986

Change-Id: I621d6b50633b130e5db16e3b90f40690fe700e94
 2021-05-14 17:50:07 +00:00
Paul Duffin 42a9a2ede6 Merge "Allow shared libraries on bootclasspath" am: b0f20d134f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707576

Change-Id: Ia599b240c43ebd916f3bd4f4c0c1a2b2eb512991
 2021-05-14 17:19:49 +00:00
Bill Peckham a1ae5530cb Merge "Fix missing headers for vndk snapshotted libc" am: 054619d198 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1708168

Change-Id: I31cd498323dd3bb13d72b9927958790d8ca95539
 2021-05-14 17:19:40 +00:00
Colin Cross 78894a5ab0 Merge "Add order-only dependency on shared libraries" am: 9debc21ca3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707986

Change-Id: Ia6aeecf11efd617344b1628a8b5aa2291c9ad8c0
 2021-05-14 17:17:26 +00:00
Paul Duffin b0f20d134f Merge "Allow shared libraries on bootclasspath" 2021-05-14 17:03:03 +00:00
Bill Peckham 054619d198 Merge "Fix missing headers for vndk snapshotted libc" 2021-05-14 16:52:11 +00:00
Colin Cross 9debc21ca3 Merge "Add order-only dependency on shared libraries" 2021-05-14 16:48:57 +00:00
Paul Duffin 79fd3d728c Allow shared libraries on bootclasspath 
A previous change treated this as an error in order to try and detect
issues with misconfigured java_sdk_library modules and/or
bootclasspath_fragment modules but unfortunately this is not always an
error, e.g. when migrating a library that was a shared library to the
bootclasspath.

This change stops treating that as an error.

Bug: 179354495
Test: m nothing
Change-Id: I4a833ab5f4caf86c6cd340090fc65d2c2f141512
 2021-05-14 16:14:17 +01:00
Paul Duffin b6f53c064e Refactor special handling of hidden API encoding for master-art 
Instead of encoding the hidden API with an empty set of flags when the
monolithic flags are not available this simply disables encoding
altogether which should have the same behavior at runtime.

This change also removes the unused flags field in hiddenAPISingleton
which was set but never read.

Bug: 179354495
Test: m nothing
Change-Id: I32d5825e5271829993dd4e5be4d4ee1b22fa7b22
 2021-05-14 15:57:10 +01:00
Paul Duffin afaa47c74a Stop generating unnecessary hidden API rules 
The rules to extract hidden API information from an individual module
in order to create module specific files are no longer necessary as
the monolithic files are created directly from the module's class jars
and not the module specific files.

Bug: 179354495
Test: verified that the monolithic out/soong/hiddenapi/... files are
      unchanged by this change
Change-Id: I573ac17f3ea5da5a2a7e4f08718160dacca71c0c
 2021-05-14 15:57:10 +01:00
Paul Duffin 537ea3d04c Generate monolithic hidden API files direct from class jars 
Previously, the monolithic hidden API files, e.g. hiddenapi-index.csv
file, were generated in two steps. First, each module created its own
files using the information in its class jars. Then, the monolithic
files were created by merging those module specific files into a larger
file.

This change switches to generating the monolithic files directly from
the class jar files and bypassing the intermediate files.

In order to ensure that this change did not change the monolithic files
it is necessary for the hiddenapi-metadata.csv to go through a
reformatting step. Hopefully, this will be able to be removed in a
follow up change.

Bug: 179354495
Test: verified that the monolithic out/soong/hiddenapi/... files are
      unchanged by this change
Change-Id: I5a78e747516014b7c0f402a4b4431b14be6a84b2
 2021-05-14 15:57:04 +01:00
Paul Duffin 850e61f234 Dedup hidden API rule generation 
Bug: 179354495
Test: verified that the monolithic out/soong/hiddenapi/... files are
      unchanged by this change
Change-Id: I54b677c97712a7573ff5eed017c1b2198b80bc51
 2021-05-14 14:53:19 +01:00
Paul Duffin 27f8ab9c19 Make hidden API handle jacoco-stubs consistently am: 098c878838 am: 86d7f1ba59 am: 63f7830b71 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707571

Change-Id: I9bf7ab8b354098403a1591622008d6363526015f
 2021-05-14 12:52:52 +00:00
Paul Duffin 63f7830b71 Make hidden API handle jacoco-stubs consistently am: 098c878838 am: 86d7f1ba59 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707571

Change-Id: I23ba1c6f9d5a06e6a1ea03f201ef2499af5417d1
 2021-05-14 12:18:23 +00:00
Paul Duffin 86d7f1ba59 Make hidden API handle jacoco-stubs consistently am: 098c878838 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707571

Change-Id: I5b1116f5fadda22142f3bf40f2782c9cf8afc10c
 2021-05-14 12:03:46 +00:00
Inseob Kim cc12d90753 Fix missing headers for vndk snapshotted libc 
VNDK snapshot depends on addExportedGeneratedHeaders to grab generated
headers. This change adds a missing addExportedGeneratedHeaders call to
make libc's headers captured correctly.

Bug: 181326838
Test: VNDK_SNAPSHOT_BUILD_ARTIFACTS=true m dist vndk && unzip -l
out/dist/*.zip

Change-Id: Iaa89b5255c836761a26c77bb27f35f768f49039e
 2021-05-14 20:15:55 +09:00
Paul Duffin 098c878838 Make hidden API handle jacoco-stubs consistently 
Previously, when code coverage was enabled the monolithic hidden API
processing would add jacoco-stubs to public APIs only as that would
make them accessible for everyone. However, the
art-bootclasspath-fragment added jacoco-stubs to public, system and
test APIs as that was the simplest way of handling it and while the
extract APIs were unnecessary they would not change behavior.

Unfortunately, that lead to a difference in the flags generated which
caused the check that verifies flags are consistent between the
monolithic and modular files to fail.

This change adds jacoco-stubs to system and test APIs for the
monolithic hidden API processing to ensure consistency.

Bug: 179354495
Bug: 188143639
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true out/soong/hiddenapi/hiddenapi-flags.csv
      - ran before making the change to reproduce the problem and after
        to verify the fix.
Change-Id: Icbd15f0ece871a8c44d9e4a73fd0f7acc3760bba
 2021-05-14 10:19:46 +00:00
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