Commit Graph

3493 Commits

Author SHA1 Message Date
Colin Cross
ea52a9204c Merge changes from topic "app_set" am: 25f15a18e5 am: cf0dd40fb3 am: 80547efe96 am: 6bf007ed59
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1893517

Change-Id: Idd87ffac9012edc088dbc48cbea33241a591d128
2021-11-19 03:31:26 +00:00
Colin Cross
246e3eed67 Move apex module installation into Soong
Move apex module installation rules into Soong by overriding
InstallBypassMake.

Soong installs don't support post install commands, so move the
symlinks into separate rules and add dependencies on them.

This relands If65d283abc86f18ad266da0bf16fe95971a0bf9c with fixes
to install files into $OUT/apex.

Bug: 204136549
Test: m checkbuild
Change-Id: I606286e971b55d9d1fc4dcd0fbd476962de5fa79
2021-11-18 13:13:44 -08:00
Colin Cross
ffbcd1d8a0 Extract primary apk from apk set zip
Extract and install the primary apk normally, and then unzip the rest
of them as a post install command.

Bug: 204136549
Test: app_set_test.go
Change-Id: I17437ff27f49df6bc91bdbbea6173b46c7d3ec4e
2021-11-17 19:55:33 -08:00
Daniel Norman
aabdbd31e1 Revert "Revert "Adds multi_install_skip_symbol_files field (defa..." am: 6cfb37af56 am: 33f4a18254 am: 79454a7405 am: a4aab6c90d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1894202

Change-Id: Ief8ef8b15dbb3d3c97b60c98bfddb2053bb803c2
2021-11-17 23:04:25 +00:00
Daniel Norman
6cfb37af56 Revert "Revert "Adds multi_install_skip_symbol_files field (defa..."
Revert submission 1893459-revert-1869814-vapex-multi-config-VKODFOVCWY

Reason for revert: Fix-forward in https://r.android.com/1894088
Reverted Changes:
I087bfe0dc:Revert "Adds a new prop context for choosing betwe...
I27a498506:Revert "Load persist props before starting apexd."...
Ib5344edc0:Revert "Allow users to choose between multi-instal...
If09bf590e:Revert "Adds multi_install_skip_symbol_files field...
I905dac14c:Revert "Demonstrate multi-installed APEXes."

Change-Id: I33210c8d3199338f9c898d719ed1797b629317af
2021-11-17 19:12:21 +00:00
Oriol Prieto Gasco
2c4a96375a Make 'Compressible' an overridable property
This is needed to allow the Android Go versions of modules
(com.google.android.go.*) to select a different compression toggle than
their non-Go (com.google.android.*) conterparts. go/go-updatability

Bug: 203024418
Test: Preloaded go variants on wembley, booted Android.
Change-Id: Ic96aff5fafb65fbd08e8a69d47c994532e27819e
2021-11-16 21:49:02 +00:00
Owen Kim
d96921eb6f Merge "Revert "Adds multi_install_skip_symbol_files field (default fals..."" am: a10ebe60ab am: dcf7a82e43 am: 4c51ab52a6 am: eda61e7ead
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1893457

Change-Id: Ia3c97cd817f7b3fc171d9602614d50cbe60d6f25
2021-11-16 09:50:55 +00:00
Owen Kim
a10ebe60ab Merge "Revert "Adds multi_install_skip_symbol_files field (default fals..."" 2021-11-16 08:39:27 +00:00
Owen Kim
065fbeb146 Revert "Adds multi_install_skip_symbol_files field (default fals..."
Revert submission 1869814-vapex-multi-config

Bug: 206551398
Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/tests/view?invocationId=I55600009996329947&testResultId=TR93527797572038984, bug b/206551398
Reverted Changes:
I0cd9d748d:Adds multi_install_skip_symbol_files field (defaul...
I5912a18e3:Demonstrate multi-installed APEXes.
I0e6881e3a:Load persist props before starting apexd.
I932442ade:Adds a new prop context for choosing between multi...
I754ecc3f7:Allow users to choose between multi-installed vend...

Change-Id: If09bf590e3ad93e14fbf89299f80d497c9604a78
2021-11-16 07:08:15 +00:00
Daniel Norman
ab5d708f3f Merge "Adds multi_install_skip_symbol_files field (default false) to apex." am: f012790f32 am: 6ddcbb7b26 am: 3e1d66958d am: 1417a11d82
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874413

Change-Id: Ia60d798366671bca001ae70ba93f8163fdae5239
2021-11-16 01:44:45 +00:00
Daniel Norman
f012790f32 Merge "Adds multi_install_skip_symbol_files field (default false) to apex." 2021-11-16 00:45:32 +00:00
Ivan Lozano
b535eb0e8d Merge "Use new soong_cc_rust_prebuilt.mk" am: 3e1bc6cc0d am: 7e68fdef86 am: c7a2d4b4aa am: 61bd087651
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890877

Change-Id: Ifde67fcb6c5aff56ddd635db3174ebb0a2cefcf0
2021-11-15 23:24:20 +00:00
Ivan Lozano
3e1bc6cc0d Merge "Use new soong_cc_rust_prebuilt.mk" 2021-11-15 22:19:46 +00:00
Sophie Zheng
8e0dadadba Merge "Java APIs used by Mainline modules." am: 7b5fa4277f am: 2a27e47fbd am: 587dbb8553 am: a31ea43aaa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887228

Change-Id: I1d3842b422b1de4faa5d0fd7b3b3035006f0d75d
2021-11-15 07:37:18 +00:00
Sophie Zheng
7b5fa4277f Merge "Java APIs used by Mainline modules." 2021-11-15 06:40:31 +00:00
sophiez
0234737f30 Java APIs used by Mainline modules.
Add scripts to generate java APIs used by Mainline modules. This is
aosp/1879177 with fixed build error that caused by dexdeps analyzing
resource only APKs which doesn't contains any .dex files. Now skip the
error generates in that case in gen_java_usedby_apex.sh

Forrest run:https://android-build.googleplex.com/builds/abtd/run/L38900000951898586

Test: TARGET_BUILD_APPS=com.android.adbd m dist apps_only
Change-Id: Id539cbe1b7306ace69c047f95ffc02265a467511
2021-11-12 23:39:35 +00:00
Daniel Norman
e19437e8f7 Adds multi_install_skip_symbol_files field (default false) to apex.
Multi-installed APEXes share the same apex_name and are installed
at the same time.

Should be set to true for all multi-installed APEXes except the singular
default version within the multi-installed group.
Only the default version can install symbol files in $(PRODUCT_OUT}/apex,
or else conflicting build rules may be created.

Bug: 199290365
Test: see https://r.android.com/1872018
Change-Id: I0cd9d748d7be3a2de40ed14f13bad71912457ddc
2021-11-12 20:45:50 +00:00
Colin Cross
32b9cd0fc2 Merge "Revert "Move apex module installation into Soong"" am: 152911f807 am: 35ee47dcbf am: ca03de2828 am: 21d7f625c3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890806

Change-Id: I2647b410bb76f237367d127490193249ce04324d
2021-11-12 20:08:22 +00:00
Colin Cross
ccba23db44 Revert "Move apex module installation into Soong"
This reverts commit e3d156a622.

Reason for revert: b/206119621

Bug: 204136549
Change-Id: I380223b86660c27bea8f5dcc2d61f32df2704c02
Fixes: 206119621
2021-11-12 19:01:29 +00:00
Ivan Lozano
d06cc748c1 Use new soong_cc_rust_prebuilt.mk
soong_{cc,rust}_prebuilt.mk has been merged. Use the new file.

Bug: N/A, clean-up
Test: m
Change-Id: I3f03e866815f6394aacd8cb0deba04f381b78c29
2021-11-12 13:27:58 -05:00
Colin Cross
66f1ef1e46 Merge "Move apex module installation into Soong" am: 4e278e5f68 am: 8dfdabc4c9 am: f24e7a7f4e am: 2098ff63f4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880605

Change-Id: I63132d59c3dc63e78b9cca1cb075bedc106b793b
2021-11-12 18:13:03 +00:00
Colin Cross
e3d156a622 Move apex module installation into Soong
Move apex module installation rules into Soong by overriding
InstallBypassMake.

Soong installs don't support post install commands, so move the
symlinks into separate rules and add dependencies on them.

Bug: 204136549
Test: m checkbuild
Change-Id: If65d283abc86f18ad266da0bf16fe95971a0bf9c
2021-11-11 17:44:42 -08:00
Laura Tsai
89c5e3a402 Merge "Revert "Add scripts to generate java APIs used by Mainline modules."" am: 33b60e4983 am: 463f87c7c5 am: fb1e24c1c7 am: 2883262457 am: 5f49af419f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885670

Change-Id: Ib9e95d6a0ce32be7d059a09a863cc1bb6edb70dc
2021-11-10 08:13:51 +00:00
Laura Tsai
33b60e4983 Merge "Revert "Add scripts to generate java APIs used by Mainline modules."" 2021-11-10 07:00:38 +00:00
Laura Tsai
be3c7eacfe Revert "Add scripts to generate java APIs used by Mainline modules."
This reverts commit c92380f001.

Reason for revert:
DroidMonitor:

DroidMonitor-triggered revert due to breakage
https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=mainline_modules_arm64-userdebug&lkgb=7898389&lkbb=7900541&fkbb=7898474,
bug 205746850

Change-Id: Ibd84dfe68dfe150b7e05b4287364d1946375bf72
2021-11-10 06:59:37 +00:00
Spandan Das
efd3f2b7f3 Merge "Add android.safetycenter to permission module permitted_packges" 2021-11-09 19:44:16 +00:00
Sophie Zheng
1ca1a4e1f9 Merge "Add scripts to generate java APIs used by Mainline modules." am: 4bb0b7a0c3 am: 5518e10391 am: 240288cbbd am: e6bcc6cb18 am: 6079902056
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1879177

Change-Id: Id47ead91179b60532eae6b956c9eb9605e125c54
2021-11-09 19:32:51 +00:00
Spandan Das
79e332c02d Add android.safetycenter to permission module permitted_packges
Currently the permitted_packages check is per apex and not per jar.
Adding android.safetycenter to the allowlist to unblock ag/16182563

Bug: 205289292
Test: TH
Change-Id: I9fc315a987af937a527872f24bf73263d2c9c9f2
2021-11-09 18:01:42 +00:00
Sophie Zheng
4bb0b7a0c3 Merge "Add scripts to generate java APIs used by Mainline modules." 2021-11-09 17:13:33 +00:00
sophiez
c92380f001 Add scripts to generate java APIs used by Mainline modules.
Test: TARGET_BUILD_APPS=com.android.adbd m dist apps_only

Change-Id: Icd854fd40c3026ae9aae6dc30c9e79027e1303a0
2021-11-05 15:38:09 -07:00
Treehugger Robot
dbb2a94cda Merge "Respect required property of apex modules" 2021-11-05 01:54:36 +00:00
TreeHugger Robot
0a96339c45 Merge "Respect required property of apex modules" 2021-11-02 00:50:46 +00:00
Colin Cross
25f69e8278 Merge changes I04f2f558,Ie16a6264,I83a3be9f,Icb3eeef3 am: 91eaa6316a am: 19aa461cc0 am: 204c59ef91 am: e097970ad8 am: ac0c4570bc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1869551

Change-Id: I01b8b582aa53394710f71eb74df28054fafde04f
2021-10-30 20:54:49 +00:00
Colin Cross
91eaa6316a Merge changes I04f2f558,Ie16a6264,I83a3be9f,Icb3eeef3
* changes:
  Rename amod variable in AndroidMkEntries.fillInEntries to base
  Make HostToolPath, HostJNIToolPath and sboxPathForToolRel use pathForInstall
  Add PathForGoBinary
  Remove PathForOutput from InstallPathToOnDevicePath
2021-10-30 19:19:53 +00:00
Treehugger Robot
cff5016d88 Merge "apex.custom_sign_tool property" am: cae893ae40 am: e18be41278 am: f11c7c9e18 am: 4c549b825a am: a18a62bafa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1869522

Change-Id: Id484c324ea7c73ddb8e610c476535bb11785202d
2021-10-30 01:06:39 +00:00
Treehugger Robot
cae893ae40 Merge "apex.custom_sign_tool property" 2021-10-29 23:39:26 +00:00
Colin Cross
790ef35d1e Make HostToolPath, HostJNIToolPath and sboxPathForToolRel use pathForInstall
Use pathForInstall instead of PathForOutput for HostToolPath,
HostJNIToolPath and sboxPathForToolRel so that they internally produce
an InstallPath that can later support being converted to Make install
path.

Bug: 204136549
Test: m checkbuild
Change-Id: Ie16a62641d113873daeec4d1dd4261251bc0d0eb
2021-10-29 16:34:55 -07:00
Colin Cross
a44551fec6 Add PathForGoBinary
Add PathForGoBinary that uses pathForInstall to return the install
path of a GoBinaryTool.  This will replace various places that used
PathForOutput to reconstruct a path to a Go tool, and will support
moving Go tools to the Make install directory outside of the
PathForOutput directory in a future patch.

Bug: 204136549
Test: m checkbuild
Change-Id: I83a3be9f5c621975540f5ed601a0b9e2611c98b9
2021-10-29 16:34:55 -07:00
Treehugger Robot
65388ec852 Merge "Make a pass over our codebase cleaning up non-precise / non-inclusive language." am: c9e85ca825 am: e68637799b am: 5bb9910ea6 am: df50b4ba4b am: 3be5075c71
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1871701

Change-Id: I744d6e359d05f169084b7844732fcc3a2870b9cf
2021-10-28 22:11:33 +00:00
Treehugger Robot
c9e85ca825 Merge "Make a pass over our codebase cleaning up non-precise / non-inclusive language." 2021-10-28 20:51:17 +00:00
Joe Onorato
b4638c1ac3 Make a pass over our codebase cleaning up non-precise / non-inclusive language.
Test: treehugger
Bug: 204369779
Change-Id: I6e63cae824d323535cdb14b493edd868df47738d
2021-10-28 10:32:07 -07:00
Jiyong Park
80751747e8 Respect required property of apex modules
This CL fixes a bug that `required` property of apex modules is not
reflected to the generated Android.mk file.

Ignore-AOSP-First: needs to be merged together with a change in vendor
directory

Bug: N/A
Test: m nothing
Change-Id: I36ccf538882f083f9433bd3eb05b3a5127f3822b
2021-10-28 15:33:55 +09:00
Jiyong Park
cacc4f358a Respect required property of apex modules
This CL fixes a bug that `required` property of apex modules is not
reflected to the generated Android.mk file.

Bug: N/A
Test: m nothing
Change-Id: I36ccf538882f083f9433bd3eb05b3a5127f3822b
2021-10-28 14:35:34 +09:00
Jooyung Han
09c11adf51 apex.custom_sign_tool property
A new property indicates a CLI tool to sign the APEX contents. The value
is stored in apexkeys.txt so that releasetool (sign_target_files_apks)
can use it to invoke the tool to re-sign the apex contents.

Bug: 193504286
Test: m out/soong/apexkeys.txt
      com.android.virt.apex line has sign_tool value
Change-Id: Ifd472049b75b5b87c1ed320f5e1190ff65ed54f2
2021-10-27 04:02:48 +09:00
Sophie Zheng
7a32a1ccec Merge "Save all the detected native shared library backing by mainline modules." am: 7fe4ccafc1 am: 3148f72c42 am: 4975230387 am: 751134c4af am: d15ba0c37f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1858614

Change-Id: If96b6d20b0e61052063f7448ea014eceace404a5
2021-10-21 20:14:25 +00:00
Sophie Zheng
7fe4ccafc1 Merge "Save all the detected native shared library backing by mainline modules." 2021-10-21 18:42:35 +00:00
Paul Duffin
47142c77db Merge "Remove artApex parameter from ApexBundleFactory" am: e760c3b724 am: fcba421625 am: 84e2edf8f2 am: 53ce24889a am: b8d29f3b84
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1862814

Change-Id: I2f3c6f1a69796431a3c6d683a5ae5cd073118163
2021-10-20 11:37:27 +00:00
Paul Duffin
eb8051d80d Remove artApex parameter from ApexBundleFactory
Since coverage support was added to bootclasspath_fragment in
https://r.android.com/1684807 and bootclasspath_fragments were
integrated into the ART APEX it is no longer necessary to treat ART
APEXes differently to other APEXes.

Change https://r.android.com/1684807 added coverage support, follow
up changes integrated

Bug: 177892522
Test: m droid
      m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true
Change-Id: I4800a003c7459c4686607e16f4c5bde0be105f16
2021-10-20 10:29:14 +00:00
sophiez
9a6eabf952 Save all the detected native shared library backing by mainline modules.
Test: TARGET_BUILD_APPS=com.google.android.adbd m dist apps_only

Change-Id: I510292542bf2550c9244e9374cd6f7b40a971486
2021-10-19 14:33:57 -07:00
Dan Willemsen
142126e68f Fix mac/allowmissingdeps builds am: 47e1a75851 am: a24a2c7d6e am: 933fb2296e am: f6b3379ee4 am: 316f60c2c1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1860414

Change-Id: Ib163545c88297b48c13a3d75a2521f2558166055
2021-10-18 01:03:33 +00:00