Commit Graph

37796 Commits

Author SHA1 Message Date
Paul Duffin
3adbb7cb05 Merge "Fix monolithic hidden API processing with prebuilts" am: a1a2baf8a7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1738977

Change-Id: I923af1abf0dd93a6ae3261df483b615ff9e38d03
2021-06-22 12:02:28 +00:00
Paul Duffin
a1a2baf8a7 Merge "Fix monolithic hidden API processing with prebuilts" 2021-06-22 11:44:11 +00:00
Paul Duffin
2a0e34f499 Merge "Fix bootDexJarByModule with UNSAFE_DISABLE_HIDDENAPI_FLAGS" am: f93d38835c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1741176

Change-Id: I2ac851f5cf70e7f1734083ea63c920689ed47b39
2021-06-22 10:19:36 +00:00
Paul Duffin
f93d38835c Merge "Fix bootDexJarByModule with UNSAFE_DISABLE_HIDDENAPI_FLAGS" 2021-06-22 09:37:17 +00:00
Colin Cross
457692448e Merge "Add --skip-config flag to soong_ui.bash" am: e7d190866a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1741453

Change-Id: If2a754c2668e1d5cacceea08810b8598c162c090
2021-06-21 20:23:18 +00:00
Paul Duffin
f250ea10e4 Merge "Make CheckHiddenAPIRuleInputs more reusable" am: 07cdd37ae5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1738976

Change-Id: Ia58fcf9138ff3315f9b47ae6b1c3518ea762b396
2021-06-21 19:57:14 +00:00
Paul Duffin
5805a4f34a Merge "Use classpath elements in platform_bootclasspath" am: 9d31361873
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1738975

Change-Id: Iaf18a08c5f5f967519535c384a8b9d5854cb5a61
2021-06-21 19:55:19 +00:00
Colin Cross
e7d190866a Merge "Add --skip-config flag to soong_ui.bash" 2021-06-21 17:14:47 +00:00
Paul Duffin
07cdd37ae5 Merge "Make CheckHiddenAPIRuleInputs more reusable" 2021-06-21 16:16:12 +00:00
Paul Duffin
9d31361873 Merge "Use classpath elements in platform_bootclasspath" 2021-06-21 16:16:00 +00:00
Adrian Roos
e95a15e7c7 Fix bootDexJarByModule with UNSAFE_DISABLE_HIDDENAPI_FLAGS
Fixes: 191652687
Test: UNSAFE_DISABLE_HIDDENAPI_FLAGS=true m
Change-Id: I7d85340681e54fbd0da69596b6846eb446c6ec6d
2021-06-21 14:55:19 +00:00
Treehugger Robot
f6b77e61a3 Merge "Direct Bazel builds from m." am: 789093a9ad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1736436

Change-Id: Ic3a85e1753d3448a2ba108f9a643884b17e539b6
2021-06-21 08:34:09 +00:00
Treehugger Robot
789093a9ad Merge "Direct Bazel builds from m." 2021-06-21 08:16:21 +00:00
Treehugger Robot
3ccb991a31 Merge "AIDEGen: Collect dependencies info from APEX module." am: 348f20be0e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1729192

Change-Id: I52fe0dcf27045360949398321c6dc5503213e6ac
2021-06-21 07:33:03 +00:00
Treehugger Robot
348f20be0e Merge "AIDEGen: Collect dependencies info from APEX module." 2021-06-21 07:17:28 +00:00
Jingwen Chen
c63677b3c9 Direct Bazel builds from m.
This CL adds support to bp2build/Soong to dump a BUILD file under
out/soong/soong_injection/targets containing alias targets to their real
targets for every converted Soong module, regardless of whether they are
handcrafted or generated.

Test: TH
Change-Id: Ic1816fda5d019c395301618134fac68b3057d752
2021-06-21 06:12:34 +00:00
Xin Li
31468a3108 [automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: 9e2dcbd080 -s ours
am skip reason: Merged-In Ie1f9147e02f79062d1a17dca5f61ff518a2ae5a6 with SHA-1 59b8d28cf6 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1741400

Change-Id: If4dc1a4a3beff4f540b6d8114e2974c3a4424630
2021-06-21 06:10:22 +00:00
Xin Li
9e2dcbd080 Merge "DO NOT MERGE - Merge RQ3A.210605.005" 2021-06-21 05:49:09 +00:00
Paul Duffin
fd198583f0 Merge "Simplify deapexer support" am: 0d7f2d30b5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1740316

Change-Id: I69b8e53916f848e9cb15f58756efba0b76c2bedd
2021-06-20 18:29:09 +00:00
Paul Duffin
5349528f57 Merge "Remove javalib special case in createDeapexerModuleIfNeeded" am: 6b592bdcdc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1740315

Change-Id: I7af2d5bcae9bf96bbf555b11feba2f48010405a4
2021-06-20 18:28:26 +00:00
Paul Duffin
d061d40eb6 Fix monolithic hidden API processing with prebuilts
Prebuilt modules do not provide classesJars containing annotations.
Previously, the monolithic hidden API processing just used classesJars
from all the modules that provided them so when building against
prebuilts would have fewer classesJars than when building against
sources and so would produce different hidden API flags.

This change will generate the monolithic files from both classesJars
and files previously generated from hidden API processing. A fragment
that has performed hidden API processing will contribute its generated
files whereas standalone libraries and fragments which have not
performed hidden API processing will contribute classesJars.

Bug: 177892522
Test: m out/soong/hiddenapi/hiddenapi-flags.csv
      m SOONG_CONFIG_art_module_source_build=false out/soong/hiddenapi/hiddenapi-flags.csv
      - verify that the files are identical whether built from
        source or prebuilts.
Change-Id: I06f3c7df49626bec21a452bc9abf1bb9e7545e5c
2021-06-20 19:09:09 +01:00
Paul Duffin
51d7da2c4e Make CheckHiddenAPIRuleInputs more reusable
Adds a message parameter and allows leading spaces in the expected file
string to allow them to be nicely indented.

Bug: 177892522
Test: m nothing
Change-Id: I33df26610738c48879fa0b8250dc377dd04bb07d
2021-06-20 19:09:09 +01:00
Paul Duffin
89f570ac44 Use classpath elements in platform_bootclasspath
Use classpath elements in newMonolithicHiddenAPIInfo. That means the
method can collate information from both fragments and libraries rather
than just fragments. So, this change moves the collation of the
classesJars into the method.

Bug: 177892522
Test: m out/soong/hiddenapi/hiddenapi-flags.csv out/soong/hiddenapi/hiddenapi-index.csv
      - make sure that this change does not affect the contents.
Change-Id: I7c2a229fab60d02bd211438735a8d7303ed83386
2021-06-20 19:09:09 +01:00
Paul Duffin
0d7f2d30b5 Merge "Simplify deapexer support" 2021-06-20 18:08:41 +00:00
Paul Duffin
6b592bdcdc Merge "Remove javalib special case in createDeapexerModuleIfNeeded" 2021-06-20 18:08:29 +00:00
Xin Li
4a5f1256e8 DO NOT MERGE - Merge RQ3A.210605.005
Bug: 190855093
Merged-In: Ie1f9147e02f79062d1a17dca5f61ff518a2ae5a6
Change-Id: I34d36eeeef40d372c0585b90685a2cee7e37a1a8
2021-06-18 15:41:15 -07:00
TreeHugger Robot
9c98aa887c Merge "Reland aosp/1535007:" into stage-aosp-master 2021-06-18 22:35:59 +00:00
Treehugger Robot
15d73e9a88 Merge "Allow disabling errorprone even when RUN_ERROR_PRONE is true" am: d430ddd0c5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1741654

Change-Id: I8666e08ac5c4cb6f88a245f8f489bbbfbbe4370a
2021-06-18 21:57:45 +00:00
Treehugger Robot
d430ddd0c5 Merge "Allow disabling errorprone even when RUN_ERROR_PRONE is true" 2021-06-18 21:37:39 +00:00
Ulya Trafimovich
55ff4a557d Reland aosp/1535007:
Enforce <uses-library> checks for android_app and android_app_import.

Bug: 132357300
Test: lunch aosp_cf_x86_phone-userdebug && m
Merged-In: I50911f727ba98df1035500dbbf467b849be8d6c2
Change-Id: Ief02df2afe56e58189e3165fbb6dbb75f6ff6384
2021-06-18 14:25:19 -07:00
Cole Faust
2b1536e4db Allow disabling errorprone even when RUN_ERROR_PRONE is true
Some modules use -XepDisableAllChecks to disable errorprone.
However, this still causes them to be compiled twice when
RUN_ERROR_PRONE is true. Allow the new enabled property to
be set to false to disable errorprone entirely, so that those
modules are only compiled once.

Bug: 190944875
Test: New unit tests
Change-Id: Ie68695db762fffcaf11bbbcb0509c4fcab73f5c5
2021-06-18 12:34:51 -07:00
Treehugger Robot
f851acaf48 Merge "[cc/pgo] Mark pgo.sampling property as an arch-variant" am: 79c4bdb3fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1740440

Change-Id: I0074793ac2698a37240e8a54eefcdb979d8c0559
2021-06-18 19:27:59 +00:00
Treehugger Robot
79c4bdb3fe Merge "[cc/pgo] Mark pgo.sampling property as an arch-variant" 2021-06-18 19:09:26 +00:00
Paul Duffin
10a66e1dee Merge "Add ClasspathElement support" am: e6aefedeba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1738974

Change-Id: I96319f285755414f01b24a65686399452c2797ab
2021-06-18 18:30:56 +00:00
Colin Cross
30e444be67 Add --skip-config flag to soong_ui.bash
--skip-config can be combined with --soong-only to skip creating
soong.variables from Make, allowing a custom soong.varibles.

Test: manual
Change-Id: Iee9bfa4efeed801339e7c3c1e4807709485e701a
2021-06-18 11:26:19 -07:00
Paul Duffin
e6aefedeba Merge "Add ClasspathElement support" 2021-06-18 18:13:06 +00:00
Pirama Arumuga Nainar
8195cdf8e3 [cc/pgo] Mark pgo.sampling property as an arch-variant
Bug: http://b/189438896

This allows disabling sampling PGO for some arches.

Test: Build this topic.
Change-Id: Ib6ddca6685c2e53092afd440ad95ec42d3a9538b
Merged-In: Ib6ddca6685c2e53092afd440ad95ec42d3a9538b
(cherry picked from commit 19a5aae35e)
2021-06-18 11:11:46 -07:00
Inseob Kim
639a38f615 Merge changes from topic "init_first_stage_soong" am: 957ef7a648
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1738296

Change-Id: I2feb373278e3e2c1cbc56374b899fdfe0e104b53
2021-06-18 17:57:42 +00:00
Inseob Kim
1ecba62ff2 Add ramdisk_available to sysprop_library am: 9da1f81382
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1736434

Change-Id: I4de76d36e9317624d649237ecb2014f4f19b44ae
2021-06-18 17:57:37 +00:00
Inseob Kim
6fa77e896d Add install_in_root to cc_binary am: 800d114003
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1736433

Change-Id: If0fc578582e5cb43077251f37b6887f218708848
2021-06-18 17:57:28 +00:00
Paul Duffin
f86a697730 Merge "Extract createEntriesForApexFile" am: e91f1537e2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1738978

Change-Id: Ide16145fb2292a57917b44377a824fc4c9aa0b89
2021-06-18 17:54:57 +00:00
Inseob Kim
957ef7a648 Merge changes from topic "init_first_stage_soong"
* changes:
  Fix ndk and aml arch order
  Add ramdisk_available to sysprop_library
  Add install_in_root to cc_binary
2021-06-18 17:12:23 +00:00
Paul Duffin
e91f1537e2 Merge "Extract createEntriesForApexFile" 2021-06-18 17:11:29 +00:00
Nikita Ioffe
59b8d28cf6 Merge "Set default value of generate_hashtree property to true" am: f932613c3f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1736785

Change-Id: Ie1f9147e02f79062d1a17dca5f61ff518a2ae5a6
2021-06-18 13:27:46 +00:00
Nikita Ioffe
f932613c3f Merge "Set default value of generate_hashtree property to true" 2021-06-18 13:14:22 +00:00
Paul Duffin
e245b61aa2 Add ClasspathElement support
The configuration of the bootclasspath, e.g. PRODUCT_BOOT_JARS,
includes libraries that are standalone and libraries that are part of
an APEX. All libraries that are part of an APEX must also be part of a
bootclasspath_fragment. Currently, the libraries and fragments are
handled separately but that is limiting as it does not make it easy to
process all the libraries while treating those from fragments
differently to standalone libraries. That is needed for hidden API
processing as it needs to use classesJars from standalone libraries
but pre-generated flag files from fragments.

This change adds support for ClasspathElements which is represents the
classpath as a whole while differentiating between standalone libraries
and fragments.

Bug: 177892522
Test: m nothing
Change-Id: I7a4adc67164a46079eb8ec0a17fc755044b4949d
2021-06-18 11:46:52 +01:00
satayev
6ea9e45d9c Merge "Add classpath fragment property to skip proto generation." am: f45966f35b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1738336

Change-Id: I153af3111b835ce3bbfb56b9d91cf43269285ee4
2021-06-18 10:29:26 +00:00
satayev
f45966f35b Merge "Add classpath fragment property to skip proto generation." 2021-06-18 10:17:50 +00:00
Paul Duffin
c4a3e6d2f3 Export boot image files from prebuilt_apex/apex_set am: 5466a3699c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1736777

Change-Id: I1cf84ff519ca6865d3a87ae75b1f48fc6ed1e3f4
2021-06-18 06:48:21 +00:00
Paul Duffin
56a6834640 Copy boot dex jars from prebuilt art-bootclasspath-fragment if preferred am: ce918b0278
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1736226

Change-Id: I116ef8467e180b691ba6e6f2bcf38cd275f6ecba
2021-06-18 06:47:41 +00:00