Commit Graph

43537 Commits

Author SHA1 Message Date
Paul Duffin
beffed2ec4 Merge "Fix bootDexJarByModule with UNSAFE_DISABLE_HIDDENAPI_FLAGS" am: f93d38835c am: 2a0e34f499
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1741176

Change-Id: I564b690203bff67f3de19fa01322a06b453b0ba8
2021-06-22 10:35:25 +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
f4ff20b038 [automerger skipped] Simplify deapexer support am: 034196d9fe -s ours
am skip reason: Merged-In I5dc77c8fb272bac289b8891d1eac801e541af1f5 with SHA-1 b4bbf2ca10 is already in history

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

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

Change-Id: I00e9a1cbd6e41b9a5193d4fbee210c4d0ce8f467
2021-06-21 20:51:21 +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
60406b25f7 Merge "Make CheckHiddenAPIRuleInputs more reusable" am: 07cdd37ae5 am: f250ea10e4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1738976

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

Change-Id: Ia072fc05e1f63b409ba8e837bd809af505b4f4e6
2021-06-21 20:16:57 +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
Paul Duffin
b8a59b12fd [automerger skipped] Remove javalib special case in createDeapexerModuleIfNeeded am: 7db57e0a77 -s ours
am skip reason: Merged-In I5cc341b5b4168b8eb196f72273a00d498de6856f with SHA-1 fef5500a76 is already in history

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

Change-Id: I94fe384741efaddf7e575f2de82cc37dcfc0849a
2021-06-21 11:54:35 +00:00
Paul Duffin
034196d9fe Simplify deapexer support
Uses the apex relative path to the file as the identifier that is used
to obtain the path to the corresponding file extracted from the apex.
That is instead of a special constructed string id.

Bug: 177892522
Test: m nothing
Merged-In: I5dc77c8fb272bac289b8891d1eac801e541af1f5
Change-Id: I5dc77c8fb272bac289b8891d1eac801e541af1f5
(cherry picked from commit b4bbf2ca10)
2021-06-21 10:54:22 +01:00
Paul Duffin
7db57e0a77 Remove javalib special case in createDeapexerModuleIfNeeded
Removes the special case in createDeapexerModuleIfNeeded for handling
java libraries and just get the Import and SdkLibraryImport module
types to implement RequiredFilesFromPrebuiltApex instead.

Bug: 177892522
Test: m nothing
Merged-In: I5cc341b5b4168b8eb196f72273a00d498de6856f
Change-Id: I5cc341b5b4168b8eb196f72273a00d498de6856f
(cherry picked from commit fef5500a76)
2021-06-21 10:54:22 +01:00
Treehugger Robot
f16f166de6 Merge "Direct Bazel builds from m." am: 789093a9ad am: f6b77e61a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1736436

Change-Id: Ifa6c5c80bd3da7a7ba5c92a3a449c6dac79ad75d
2021-06-21 08:50:34 +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
f2d15a6921 Merge "AIDEGen: Collect dependencies info from APEX module." am: 348f20be0e am: 3ccb991a31
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1729192

Change-Id: Ie79c4757cd3e190c1bd9a03a8ee6302306fc9952
2021-06-21 07:50:24 +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
Xin Li
7943e7e5a9 [automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: 9e2dcbd080 -s ours am: 31468a3108 -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: I4e0c4ed5d20b6b56555935a5cf995b6647e5fd49
2021-06-21 06:42:50 +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
c2d7c036e1 Merge "Simplify deapexer support" am: 0d7f2d30b5 am: fd198583f0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1740316

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

Change-Id: Idef64da43b738b9f51c2e2ec1b563281eab4a60f
2021-06-20 18:43:11 +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
47d814da36 [automerger skipped] Merge "Add ClasspathElement support" into sc-dev am: 062838fcca -s ours
am skip reason: Merged-In I7a4adc67164a46079eb8ec0a17fc755044b4949d with SHA-1 e245b61aa2 is already in history

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

Change-Id: I300568889cae133da87e3abf8c7eab8b94d7458e
2021-06-20 18:27:50 +00:00
Paul Duffin
b0cfadba83 [automerger skipped] Merge "Extract createEntriesForApexFile" into sc-dev am: 1970d6c5ce -s ours
am skip reason: Merged-In Ia063b513f758e1bbe73407c0441b72453f412acf with SHA-1 155c17779c is already in history

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

Change-Id: I24c04179e80f805eb1ed58f479084237e3a13f27
2021-06-20 18:27:38 +00: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
Paul Duffin
062838fcca Merge "Add ClasspathElement support" into sc-dev 2021-06-20 18:06:03 +00:00
Paul Duffin
1970d6c5ce Merge "Extract createEntriesForApexFile" into sc-dev 2021-06-20 18:05:55 +00:00
Nikita Ioffe
eb9fc5d77c [automerger skipped] Merge "Set default value of generate_hashtree property to true" into sc-dev am: 5476c95e50 -s ours
am skip reason: Merged-In I546730f168632c5d5d41c686853bde93a8ba7911 with SHA-1 e261ae64e2 is already in history

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

Change-Id: I105b26f3034ac1d71c8946a54499c996e33d5e65
2021-06-19 00:24:33 +00:00
Nikita Ioffe
5476c95e50 Merge "Set default value of generate_hashtree property to true" into sc-dev 2021-06-19 00:12:16 +00:00
TreeHugger Robot
57df633ddd [automerger skipped] Merge "Reland aosp/1535007:" into stage-aosp-master am: 9c98aa887c -s ours
am skip reason: Merged-In I50911f727ba98df1035500dbbf467b849be8d6c2 with SHA-1 ea50a05063 is already in history

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

Change-Id: Ic0fdf8d8cc2b4502c05c434d71983c2f89190305
2021-06-18 22:48:36 +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
f830560979 Merge "Allow disabling errorprone even when RUN_ERROR_PRONE is true" am: d430ddd0c5 am: 15d73e9a88
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1741654

Change-Id: Id616b4237e74e382ac7fc7902cbc43950875fc91
2021-06-18 22:09:04 +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
Paul Duffin
4ce193348f [automerger skipped] Export boot image files from prebuilt_apex/apex_set am: b508405e08 -s ours
am skip reason: Merged-In I1d4d9545172d79282918130df6b9aa55471bffc1 with SHA-1 5466a3699c is already in history

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

Change-Id: Id07476e4c15fe50d5287be5162c5064ce1759473
2021-06-18 20:23:20 +00:00
Paul Duffin
b6a4c95731 [automerger skipped] Copy boot dex jars from prebuilt art-bootclasspath-fragment if preferred am: a0089ec78c -s ours
am skip reason: Merged-In I35b37355170546daf6ecac2134d1ca9a73d0e3bc with SHA-1 ce918b0278 is already in history

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

Change-Id: Ie19ebdace56233d04b7c6bfb046628c7f51410cd
2021-06-18 20:23:15 +00:00