Commit Graph

46555 Commits

Author SHA1 Message Date
Adrian Roos
e50f1735b6 Merge "Revert "Preopt APEX system server jars."" am: 79839d94c1 am: 755a09490f am: abda2b7474 am: f3f17d366e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1827535

Change-Id: I9e1713184dbd37c678c1dce4ab45cec2f6cf93bd
2021-09-15 15:38:47 +00:00
Adrian Roos
f3f17d366e Merge "Revert "Preopt APEX system server jars."" am: 79839d94c1 am: 755a09490f am: abda2b7474
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1827535

Change-Id: I7e9a50cc4bd84a8951bf85fe3685ce253cd7f4a0
2021-09-15 15:21:19 +00:00
Adrian Roos
abda2b7474 Merge "Revert "Preopt APEX system server jars."" am: 79839d94c1 am: 755a09490f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1827535

Change-Id: Iedd4451747168a23a0d39f07eb75a20def89bc6d
2021-09-15 15:08:57 +00:00
Liz Kammer
399d09ee6c Merge "Expand handling of unconverted deps in bp2build" am: 83d07a4c41 am: a191dc0520 am: e477d67f50 am: e773261327
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1811096

Change-Id: I1955b09258bf075ca8d83f30fdb45ea6a8fccfb6
2021-09-15 14:54:50 +00:00
Adrian Roos
755a09490f Merge "Revert "Preopt APEX system server jars."" am: 79839d94c1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1827535

Change-Id: I2281010a93a89b69b859272627c7eac0d7e6d3ed
2021-09-15 14:53:58 +00:00
Liz Kammer
e773261327 Merge "Expand handling of unconverted deps in bp2build" am: 83d07a4c41 am: a191dc0520 am: e477d67f50
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1811096

Change-Id: I497aaadac75817de981742e6fa36c1901d8af75e
2021-09-15 14:33:01 +00:00
Adrian Roos
79839d94c1 Merge "Revert "Preopt APEX system server jars."" 2021-09-15 14:31:42 +00:00
Paul Duffin
8193fe77fb Merge "Avoid direct access to Native_bridge_supported property" am: 5ef58a302f am: 9771209aee am: 517e3e9673 am: 98a2dd76d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826226

Change-Id: I13fab59e9e1d5b94a0524d54efd47c7299a7b4d0
2021-09-15 14:27:52 +00:00
Paul Duffin
ef2376b685 Merge "Rename SdkMemberTypeDependencyTag to SdkMemberDependencyTag" am: c2c7f3e49b am: 063ad070c0 am: b4e6408f03 am: 529c5dc486
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826225

Change-Id: Ic377536c4a09019ac6d5ecf642d42a859280e591
2021-09-15 14:27:43 +00:00
Liz Kammer
e477d67f50 Merge "Expand handling of unconverted deps in bp2build" am: 83d07a4c41 am: a191dc0520
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1811096

Change-Id: I240d79257cdf4d0fad468f9ef51560d0ed8636da
2021-09-15 14:18:26 +00:00
Paul Duffin
98a2dd76d5 Merge "Avoid direct access to Native_bridge_supported property" am: 5ef58a302f am: 9771209aee am: 517e3e9673
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826226

Change-Id: Ib1bf51dd7c1986d51b4f732969a0d53210bb7d3a
2021-09-15 14:13:55 +00:00
Paul Duffin
529c5dc486 Merge "Rename SdkMemberTypeDependencyTag to SdkMemberDependencyTag" am: c2c7f3e49b am: 063ad070c0 am: b4e6408f03
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826225

Change-Id: I726f17856b37e5cb8401b9961fbddd259bb8b274
2021-09-15 14:13:42 +00:00
Adrian Roos
92346c4832 Revert "Preopt APEX system server jars."
This reverts commit ca9bc98e0c.

Reason for revert: breaks build
Bug: 200024131

Change-Id: Ide07b4c4d267370ae31107b1598b2f878c701282
2021-09-15 14:11:07 +00:00
Liz Kammer
a191dc0520 Merge "Expand handling of unconverted deps in bp2build" am: 83d07a4c41
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1811096

Change-Id: Ib53f05fd0b7bbfdc7256abaf7b5d8eef7722f848
2021-09-15 14:03:58 +00:00
Paul Duffin
517e3e9673 Merge "Avoid direct access to Native_bridge_supported property" am: 5ef58a302f am: 9771209aee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826226

Change-Id: If8c4cc0709258983dfd88201aeee155ff3c92425
2021-09-15 13:59:25 +00:00
Paul Duffin
b4e6408f03 Merge "Rename SdkMemberTypeDependencyTag to SdkMemberDependencyTag" am: c2c7f3e49b am: 063ad070c0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826225

Change-Id: I4a5ba8b506a45b2774034d6ea9327472f5026ec3
2021-09-15 13:59:19 +00:00
Liz Kammer
83d07a4c41 Merge "Expand handling of unconverted deps in bp2build" 2021-09-15 13:49:48 +00:00
Paul Duffin
9771209aee Merge "Avoid direct access to Native_bridge_supported property" am: 5ef58a302f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826226

Change-Id: I472f1af991cd6a04ed42d5cc1b0dbca28ce5b699
2021-09-15 13:44:10 +00:00
Paul Duffin
063ad070c0 Merge "Rename SdkMemberTypeDependencyTag to SdkMemberDependencyTag" am: c2c7f3e49b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826225

Change-Id: I304997b8488094a28ef8b75baaf0d9c4341b1512
2021-09-15 13:44:01 +00:00
Liz Kammer
576c389d5d Merge "Bp2build: handle embedded structs as blueprint" am: adfade58a9 am: cfbad2bb31 am: a31ff68c4a am: e51e10a5b8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826433

Change-Id: I9714911e44351785387d855acb80913923170caa
2021-09-15 13:36:44 +00:00
Paul Duffin
5ef58a302f Merge "Avoid direct access to Native_bridge_supported property" 2021-09-15 13:29:32 +00:00
Paul Duffin
c2c7f3e49b Merge "Rename SdkMemberTypeDependencyTag to SdkMemberDependencyTag" 2021-09-15 13:29:23 +00:00
Liz Kammer
e51e10a5b8 Merge "Bp2build: handle embedded structs as blueprint" am: adfade58a9 am: cfbad2bb31 am: a31ff68c4a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826433

Change-Id: I605d2394a66501fa19a6544d6f36323a07c3c8db
2021-09-15 13:19:56 +00:00
Liz Kammer
a31ff68c4a Merge "Bp2build: handle embedded structs as blueprint" am: adfade58a9 am: cfbad2bb31
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826433

Change-Id: Iaf63b13709fe06cc437e872d5ab33f9d5fe9d690
2021-09-15 13:05:54 +00:00
Liz Kammer
cfbad2bb31 Merge "Bp2build: handle embedded structs as blueprint" am: adfade58a9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826433

Change-Id: Ief7a8edb7e82e537a657d9d74f122b1db0629471
2021-09-15 12:53:18 +00:00
Liz Kammer
adfade58a9 Merge "Bp2build: handle embedded structs as blueprint" 2021-09-15 12:39:29 +00:00
Jiakai Zhang
9ce81715f7 Preopt APEX system server jars. am: ca9bc98e0c am: 83d0d8ac1c am: 6ff963aacb am: 3b3063da67
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1821984

Change-Id: I28d3b3e853abeee3da90e703ddf0bcfe0a757f80
2021-09-15 11:31:53 +00:00
Jiakai Zhang
3b3063da67 Preopt APEX system server jars. am: ca9bc98e0c am: 83d0d8ac1c am: 6ff963aacb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1821984

Change-Id: I0a9f688486a130bf77db0ba58652fbe1aaa199e1
2021-09-15 11:19:39 +00:00
Jiakai Zhang
6ff963aacb Preopt APEX system server jars. am: ca9bc98e0c am: 83d0d8ac1c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1821984

Change-Id: Id4a6e38a8756aae03fd007eaa8274cf77c5780bc
2021-09-15 11:02:00 +00:00
Jiakai Zhang
83d0d8ac1c Preopt APEX system server jars. am: ca9bc98e0c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1821984

Change-Id: If42b905c0636b10881b372efafd3e2f9bc84923c
2021-09-15 10:48:53 +00:00
Treehugger Robot
d6516f7406 Merge "Add system/sepolicy/apex to bp2build allowlist" am: 709f02707d am: 780f559584 am: c9205db966 am: 76fe812b7d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826628

Change-Id: I4c040555c69cf99991b87f8e13fe335d5152287b
2021-09-15 09:04:28 +00:00
Jiakai Zhang
ca9bc98e0c Preopt APEX system server jars.
The path to the artifacts will in the form of
/system/framework/oat/<arch>/<encoded-jar-path>@classes.{odex,vdex,art},
where <encoded-jar-path> is the path to the jar file with "/" replaced
by "@". For example,
/system/framework/oat/x86_64/apex@com.android.art@javalib@service-art.jar@classes.odex

There will be a follow-up CL to update ART runtime to recognize
artifacts in that path.

Test: m com.android.art
Bug: 194150908
Change-Id: Ic89fd63c4b1cd565684cead83fc91dae3bc97a4c
2021-09-15 09:01:07 +00:00
Treehugger Robot
76fe812b7d Merge "Add system/sepolicy/apex to bp2build allowlist" am: 709f02707d am: 780f559584 am: c9205db966
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826628

Change-Id: I5b748a68d8ac1126218b5567df011e25fe7ebe04
2021-09-15 08:53:40 +00:00
Treehugger Robot
c9205db966 Merge "Add system/sepolicy/apex to bp2build allowlist" am: 709f02707d am: 780f559584
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826628

Change-Id: Ib1ce19047afb812c21757eaad89a65c614c3744f
2021-09-15 08:39:29 +00:00
Treehugger Robot
780f559584 Merge "Add system/sepolicy/apex to bp2build allowlist" am: 709f02707d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826628

Change-Id: If90417ce5553bac5acaf448987a661b757665d5f
2021-09-15 08:24:02 +00:00
Treehugger Robot
709f02707d Merge "Add system/sepolicy/apex to bp2build allowlist" 2021-09-15 08:10:14 +00:00
Treehugger Robot
22c6891939 Merge "Fix panic when a module has an invalid output path" am: cf6749630a am: 32e5355bab am: b2e53db028 am: faf1826ea9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826960

Change-Id: Iaa44ab3127a4c5201753853f861c608f8a5b7a22
2021-09-15 05:21:48 +00:00
Treehugger Robot
faf1826ea9 Merge "Fix panic when a module has an invalid output path" am: cf6749630a am: 32e5355bab am: b2e53db028
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826960

Change-Id: I33093f478be2bea3a8f215f75395d901df0541c1
2021-09-15 05:04:12 +00:00
Treehugger Robot
b2e53db028 Merge "Fix panic when a module has an invalid output path" am: cf6749630a am: 32e5355bab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826960

Change-Id: I5daad76b1f084938a86c74e316f2adeeb7df2fe1
2021-09-15 04:50:55 +00:00
Treehugger Robot
32e5355bab Merge "Fix panic when a module has an invalid output path" am: cf6749630a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826960

Change-Id: I972bbb9b99121e1ee4ffb33c0278f239dd61db8f
2021-09-15 04:37:54 +00:00
Treehugger Robot
cf6749630a Merge "Fix panic when a module has an invalid output path" 2021-09-15 04:23:13 +00:00
Guang Zhu
463c029e6c Merge "update build rules to use /data/local/tests/unrestricted" am: 7b32612dc4 am: da4d36227f am: 736654b861 am: a83dc7d462
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826231

Change-Id: Ic0a0191dab37d2ac6e0adfbdddb2ed0c46265bff
2021-09-15 00:57:59 +00:00
Treehugger Robot
8cbe142522 Merge "Add {.aar} support for android_library" am: db3ff57368 am: 7b3130a459 am: 7181c70efb am: bc1de88b71
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826617

Change-Id: Id7701d97ae027b0585c120f58a801b237e089f42
2021-09-15 00:57:49 +00:00
Guang Zhu
a83dc7d462 Merge "update build rules to use /data/local/tests/unrestricted" am: 7b32612dc4 am: da4d36227f am: 736654b861
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826231

Change-Id: I98053bf9300d08a73531a922d47f11b901dcd5b9
2021-09-15 00:48:58 +00:00
Treehugger Robot
bc1de88b71 Merge "Add {.aar} support for android_library" am: db3ff57368 am: 7b3130a459 am: 7181c70efb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826617

Change-Id: I7edde41fad13fcc6b9d3c89c66ec604bf9b29fea
2021-09-15 00:48:51 +00:00
Cole Faust
4ebe5aee4a Fix m product-graph am: 521e951ad4 am: ec84292f1b am: 06103c45c5 am: ed16687b92
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826630

Change-Id: I6994a1ab14ee8c74b3cc9954536ba9dc6d4ef60c
2021-09-15 00:42:05 +00:00
Cole Faust
64cb7c964a Fix panic when a module has an invalid output path
dep.OutputFile().Path() can panic if the OutputFile
is invalid, so move more of the code into the check
for validity. This changes the go crash into a
build error.

Bug: 158624492
Test: Apply the patchset 1 of ag/11815659, lunch aosp_x86_64-eng, m
Change-Id: Ic8a728be1b570ac73be7b2b9461676f9fd99c266
2021-09-14 17:35:19 -07:00
Guang Zhu
736654b861 Merge "update build rules to use /data/local/tests/unrestricted" am: 7b32612dc4 am: da4d36227f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826231

Change-Id: I7f69d11f6ca9ef9aa6ae4c4b1fe4d98e1d77b528
2021-09-15 00:35:01 +00:00
Treehugger Robot
7181c70efb Merge "Add {.aar} support for android_library" am: db3ff57368 am: 7b3130a459
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826617

Change-Id: I4a36a0cf422a476c4a80b47c14ecf4c2e7cd630a
2021-09-15 00:34:53 +00:00
Cole Faust
ed16687b92 Fix m product-graph am: 521e951ad4 am: ec84292f1b am: 06103c45c5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826630

Change-Id: I66a12b08bdb47a1dd18252e1e919894ec13db5f6
2021-09-15 00:29:00 +00:00