Commit Graph

2576 Commits

Author SHA1 Message Date
Jooyung Han
62d0b91ef3 apex: pass init_rc/vintf_fragments to make am: 07931c73a3 am: 89287e071a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1425588

Change-Id: Ia1a6ef9006688f9b41f71148bcdcfae4a600b53d
2020-09-11 15:48:54 +00:00
Jooyung Han
07931c73a3 apex: pass init_rc/vintf_fragments to make
For "non-updatable" devices, apex_manifest.pb is a module representing
the apex, so we need to pass common properties like init_rc and
vintf_fragments to the Make module of apex_manifest.pb so that those
files are copied when the apex is installed as flattened.

Bug: 159211312
Bug: 167383491
Test: lunch aosp_sunfish-userdebug
      OVERRIDE_TARGET_FLATTEN_APEX=true m com.android.vibrator.sunfish
      check $OUT/vendor/etc for init_rc/vintf_fragmemts
Change-Id: I5d5ce5acb9b837da2fb4e6ee8f3813707c6c3bd4
2020-09-11 17:33:19 +09:00
Xin Li
80dc4f137a Merge "Merge Android R" 2020-09-10 17:22:09 +00:00
Kousik Kumar
c10fd9d1c6 Merge "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c am: f15ed4fe61 am: 4ed93ef2d6 am: 330184504b am: 08db7c4b37
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1419252

Change-Id: I02fffd8b3b85a9fb4d0d4f6e314c7e287d3b8360
2020-09-10 11:17:24 +00:00
Kousik Kumar
4ed93ef2d6 Merge "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c am: f15ed4fe61
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1419252

Change-Id: Ib20373674f64449731a151726ade8bab52a14661
2020-09-10 10:03:52 +00:00
Kousik Kumar
f15ed4fe61 Merge "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1419252

Change-Id: I52b7a3810fdf3314ae107f4b8330e9d6f62c6302
2020-09-10 09:50:35 +00:00
Kousik Kumar
3e0b9c031c Merge "Check UseRBE is set before replacing any template with the RE version." 2020-09-10 09:24:17 +00:00
Xin Li
429c23c1fa Merge Android R
Bug: 168057903
Merged-In: I9d5d0da0f409bd6b131f7e0f6363be061d3045c1
Change-Id: Ie7feaf6a3d0787c750de17540969b876a4306b0a
2020-09-09 20:21:02 -07:00
markchien
80092e30a6 Include bpf program in APEXes
bpf program is put to an APEX via 'bpfs' property. It is
placed under etc/bpf directory in it.

Fix: 167530625
Test: m

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

Merged-In: Ia36b486f0cffb619ecc4f7a318cde881abc5baf4
Change-Id: I42631beea4e668d86ba437d3e2edb392137706f0
(cherry picked from commit 05e47c0c5d)
2020-09-10 02:31:55 +00:00
Treehugger Robot
8c0773bcee Merge "Notice files for prebuilt_etc are included in APEX" am: 4f35976c87 am: 410b20dba2 am: dae2bca0a8 am: 66df7b4c0f am: 02303504dd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1421373

Change-Id: Ic177090ef0b64e525d464f46dc28038097f50201
2020-09-10 02:07:27 +00:00
Treehugger Robot
dae2bca0a8 Merge "Notice files for prebuilt_etc are included in APEX" am: 4f35976c87 am: 410b20dba2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1421373

Change-Id: I6e117c38efbafe6adf855114ab73ac978a2dd073
2020-09-10 00:46:04 +00:00
Treehugger Robot
410b20dba2 Merge "Notice files for prebuilt_etc are included in APEX" am: 4f35976c87
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1421373

Change-Id: Ifbfd71ff4416b07742e70c9d9aba523d60af1d2b
2020-09-10 00:30:29 +00:00
Saeid Farivar Asanjan
0b94aab5ef Add car-ui-lib-overlayable to apex allowed_deps
Bug: 168062639
Test: manual
Change-Id: If31714ad0ab00af65e6f880fb8f7224e2c46d0a3
2020-09-09 04:21:26 +00:00
Jiyong Park
41f637d653 Notice files for prebuilt_etc are included in APEX
This change fixes a bug that notice files for some module type (e.g.
prebuilt_etc) were not included in APEX. This happened because we relied
on WalkPayloadDeps which actually doesn't traverse module types that
don't implement ApexModule interface. prebuilt_etc is one such module
type. Fixing the problem by also iterating the filesInfo array which
has info about all modules that are included in the APEX.

Bug: 166575301
Test: m com.android.tzdata and inspect the built artifact.
NOTICE.html.gz is there.

Change-Id: Iceb055b60184aef2a3e65e44680304853eb79a53
2020-09-09 13:19:56 +09:00
Mark Chien
fd7dad5016 Merge "Include bpf program in APEXes" am: 66a0ae60f8 am: 288f40ba51 am: 05e47c0c5d am: 10893ea830 am: c98c7e3b28
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418308

Change-Id: I25796c021f4eac123ad324156bcb810a795b7266
2020-09-04 10:39:09 +00:00
Mark Chien
05e47c0c5d Merge "Include bpf program in APEXes" am: 66a0ae60f8 am: 288f40ba51
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418308

Change-Id: I42631beea4e668d86ba437d3e2edb392137706f0
2020-09-04 09:25:36 +00:00
Mark Chien
288f40ba51 Merge "Include bpf program in APEXes" am: 66a0ae60f8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418308

Change-Id: I86983c1012615e95d1d9aac875a52e92248a17b8
2020-09-04 09:11:22 +00:00
Mark Chien
66a0ae60f8 Merge "Include bpf program in APEXes" 2020-09-04 08:58:21 +00:00
Ramy Medhat
16f23a4038 Check UseRBE is set before replacing any template with the RE version.
Test: presubmit
Change-Id: I6df58b4e700f0d231367af2710672d731d20a736
2020-09-03 01:29:49 -04:00
Colin Cross
7a142a4b78 Merge changes I59b7a32a,Ida7bc75a am: 0329f2398c am: 90d0500699 am: 3fa94fc983 am: 78395a8673 am: b443661414
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1406259

Change-Id: I0ab4e4c0775aaf9e08a582e714512e26094640ea
2020-09-03 02:34:00 +00:00
Colin Cross
3fa94fc983 Merge changes I59b7a32a,Ida7bc75a am: 0329f2398c am: 90d0500699
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1406259

Change-Id: Idb4028f1b5522080050802fa944276668ccea3a4
2020-09-03 00:53:20 +00:00
Colin Cross
90d0500699 Merge changes I59b7a32a,Ida7bc75a am: 0329f2398c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1406259

Change-Id: I9b2b709c59630394aa528c64b4fbe60b52d50be5
2020-09-03 00:21:49 +00:00
Colin Cross
0329f2398c Merge changes I59b7a32a,Ida7bc75a
* changes:
  Only request image and version variations for device SDK dependencies
  Create os and arch variants for GoBinaryTool modules
2020-09-02 23:51:53 +00:00
markchien
2f59ec98d1 Include bpf program in APEXes
bpf program is put to an APEX via 'bpfs' property. It is
placed under etc/bpf directory in it.

Fix: 167530625
Test: m
Change-Id: Ia36b486f0cffb619ecc4f7a318cde881abc5baf4
2020-09-02 22:18:25 +08:00
Jooyung Han
3be2358038 Merge commit '0703fd873fe2ed492266a4457a1e217971c2f4f0' into manual_merge_1e3d9fb376aaf1be6de1bd16a9004ccc95226ab0 am: 4c92cad10e am: 4d565700b5 am: 378ff68eb5 am: 1b06154e8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12501269

Change-Id: I0e9a408b9547fad45983f39a5b7dbacd19b29c1d
2020-09-02 08:41:05 +00:00
Jooyung Han
4d565700b5 Merge commit '0703fd873fe2ed492266a4457a1e217971c2f4f0' into manual_merge_1e3d9fb376aaf1be6de1bd16a9004ccc95226ab0 am: 4c92cad10e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12501269

Change-Id: I8e037438662de1fef170a8ba1aa6ca8621b04cc0
2020-09-02 07:19:06 +00:00
Jooyung Han
4c92cad10e Merge commit '0703fd873fe2ed492266a4457a1e217971c2f4f0' into manual_merge_1e3d9fb376aaf1be6de1bd16a9004ccc95226ab0
Change-Id: I7115a50254e23e3f7d9cdab960c671195746978e
2020-09-02 14:19:18 +09:00
Xin Li
ca52d2ff53 Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master 2020-09-01 20:01:23 +00:00
Jooyung Han
0703fd873f apex: support prebuilt_firmware for vendor apexes
prebuilt_firmware module is one of many prebuilt_etc-like modules. When
it is soc-specific, it is installed in /vendor/firmware. Similarly, when
prebuilt_firmware is embeded in a vendor apex, installing it in
<apex>/firmware instead of <apex>/etc.

Bug: 162701747
Test: lunch sunfish-userdebug
      m && device boots && vibrator works
Change-Id: I00d28cde42259aaf8221e3897df77efc42b0c1ca
2020-09-01 10:45:13 +09:00
Colin Cross
e50ee06781 Merge "Remove hack for platform availability of modules with missing apexes" am: 9c35c9ae63 am: 207037e03e am: cc1cae5634 am: b2022ea731 am: 17d8eb7d79
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1414830

Change-Id: I374ab32e1e66b696e51c4742baf762a995c96321
2020-08-31 06:32:30 +00:00
Colin Cross
cc1cae5634 Merge "Remove hack for platform availability of modules with missing apexes" am: 9c35c9ae63 am: 207037e03e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1414830

Change-Id: Idee1003b69dcd845548362effd26d832f8ddf96d
2020-08-31 05:21:46 +00:00
Colin Cross
9c35c9ae63 Merge "Remove hack for platform availability of modules with missing apexes" 2020-08-31 04:20:18 +00:00
Xin Li
65cb5c69ea Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: Ifca7b65f4e27bf14cdc30f72f790b0de90130bae
Change-Id: I3a39be5f0b8736de4822c6a14072c78d4e4ad89d
2020-08-29 01:17:45 -07:00
Baligh Uddin
6ade6f7f6a Update apex/allowed_deps.txt
Bug: 165255241
Test: ./vendor/google/build/build_mainline_modules.sh -j30
Change-Id: Ia772bf606359081eadd145b55c3fd1e4e8d9cbaf
2020-08-29 01:43:14 +00:00
TreeHugger Robot
016d0fe2d5 Merge "Update apex/allowed_deps.txt" 2020-08-28 23:31:16 +00:00
Nikita Ioffe
a0254b5289 Merge "Add F2FS support for APEX build system" 2020-08-28 21:55:24 +00:00
Colin Cross
d2c81a7933 Remove hack for platform availability of modules with missing apexes
The affected modules weren't actually built in the affected build,
delay the platform availability check in Make instead to allow
the build to proceed.

Bug: 154888298
Test: m checkbuild
Change-Id: I21778e38e04635545b352dee2043a33ec9da246b
2020-08-28 13:32:02 -07:00
Baligh Uddin
836a1985a1 Update apex/allowed_deps.txt
Bug: 165255241
Test: ./vendor/google/build/build_mainline_modules.sh -j30
Change-Id: I0ba08bde24b380ca69d3cd4bae2670af9a3a059b
2020-08-28 16:13:26 +00:00
Theotime Combes
cb70bdb346 Add F2FS support for APEX build system
Add the new property payload_fs_type in apex module type. Either 'f2fs'
or 'ext4'. Default 'ext4'.

Exempt-From-Owner-Approval: Jiyong reviewed this change
Test: m

Bug: 158453869
Merged-In: I36f373251bd597e11acb62af75437a87e2a531ec
Change-Id: I36f373251bd597e11acb62af75437a87e2a531ec
(cherry picked from commit b20d6629aefd2100ec95583ed946de852f1d6bf4)
(cherry picked from commit 1c751e1453)
2020-08-28 15:00:28 +01:00
Jooyung Han
90efaa1758 Merge "apex: dedup jni_libs when generating apex_manifest" am: dcbb66f8c9 am: e145e4c081 am: 57770f6b59 am: 2cb21b2df1 am: 283452002f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1413429

Change-Id: I6dc631259a3a10dfea387e77111e40513546b4ca
2020-08-28 13:28:04 +00:00
Jooyung Han
57770f6b59 Merge "apex: dedup jni_libs when generating apex_manifest" am: dcbb66f8c9 am: e145e4c081
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1413429

Change-Id: I326532fc0f3c87bcec283e810ed866431f49de9b
2020-08-28 12:08:03 +00:00
Theotime Combes
4ba38c1a3f Add F2FS support for APEX build system
Add the new property payload_fs_type in apex module type. Either 'f2fs'
or 'ext4'. Default 'ext4'.

Test: m

Bug: 158453869
Change-Id: I36f373251bd597e11acb62af75437a87e2a531ec
Merged-In: I36f373251bd597e11acb62af75437a87e2a531ec
2020-08-28 12:03:00 +00:00
Theotime Combes
a7f42b7137 Merge "Add F2FS support for APEX build system" 2020-08-28 11:35:03 +00:00
Theotime Combes
1c751e1453 Add F2FS support for APEX build system
Add the new property payload_fs_type in apex module type. Either 'f2fs'
or 'ext4'. Default 'ext4'.

Exempt-From-Owner-Approval: Jiyong reviewed this change
Test: m

Bug: 158453869
Change-Id: I36f373251bd597e11acb62af75437a87e2a531ec
(cherry picked from commit b20d6629aefd2100ec95583ed946de852f1d6bf4)
2020-08-28 11:28:40 +00:00
Jooyung Han
b9007609f6 apex: dedup jni_libs when generating apex_manifest
When we package both 32/62, there could be two instances of the same
library. We need to dedup the list of jni_libs.

Bug: n/a
Test: m com.android.cronet (which uses jni_libs)
      check apex_manifest.pb
Change-Id: I9a9f42f0f5219ab7bc50d945b54113b5d823b7f3
2020-08-28 16:33:16 +09:00
Colin Cross
7cbfb8d594 Merge changes I6aa28149,I1ff35ea9 am: 3806fc0943 am: fb6ddeb5fd am: ef70e3f8bc am: a991e8dc72 am: 706f788545
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1406258

Change-Id: I7052d56cdabbb97f3416199b429fe492db2765a0
2020-08-27 08:24:58 +00:00
Remi NGUYEN VAN
e297ce5ff5 Add NetworkStack AIDL interfaces to allowed_deps
The list contains an entry for the unstable interface (used in
development branches) and the SDK current interface (used in the module
branch on older module versions), but is missing an entry for the stable
interface, with minSdkVersion=29.

Bug: 166414751
Test: m
Change-Id: Ifd4a43321547256b8a738aca9133ec69e58133f9
2020-08-27 10:36:11 +09:00
Colin Cross
ef70e3f8bc Merge changes I6aa28149,I1ff35ea9 am: 3806fc0943 am: fb6ddeb5fd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1406258

Change-Id: I5d1ca5d5927b3a3c8641a17d2bc40cf10352c1e9
2020-08-27 01:28:50 +00:00
Colin Cross
42507337e5 Only request image and version variations for device SDK dependencies
AddFarVariationDependencies was broken, which allowed sdk modules to
request dependencies using image and version variations, even for
host modules that do not have image or version variations.  Make
the image and version variations conditional on device sdk modules.

Test: go test ./sdk
Change-Id: I59b7a32a3782254fd5feb828a5258ee13d4db812
2020-08-26 11:51:51 -07:00
Jeongik Cha
5f0b222aab Update apex/allowed_deps.txt
Bug: 165255241
Test: TARGET_BUILD_APPS=something UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true m
Merged-In: I9f98361aa248b82cb58527a5cd59e6d17c3e8723
Change-Id: I9f98361aa248b82cb58527a5cd59e6d17c3e8723
(cherry picked from commit 0c0234b982)
2020-08-26 12:43:06 +00:00