Commit graph

46786 commits

Author SHA1 Message Date
Jooyung Han
4f71e12cc7 Set min_sdk_version (packages/modules/adb)
Many modules requiring min_sdk_version have been used without setting
it, but hard-coded in allowlist.

Bug: 158059172
Test: m
Change-Id: I6d11425f9c5db11cd52dd81f7500e4424555bfb5
2021-11-22 10:20:53 +09:00
Treehugger Robot
170652045d Merge "sbox: run commands using script for large commands" am: ec014011ea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1881273

Change-Id: Ic3868bbf593debaf7e2f961955f6b07bb0191e1d
2021-11-20 00:09:59 +00:00
Colin Cross
5336a09b91 Prepend header jar for sharded javac compilation am: 3d56ed5605
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897430

Change-Id: Id8c71095d07439c3722dbf1585a3d18ea3b70f0f
2021-11-20 00:09:45 +00:00
Colin Cross
d4ce0c64f5 Merge "Revert "Move apex module installation into Soong"" am: 500bba1b20
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897971

Change-Id: Iab473c76d7ded6a20ce87584a18c396ca0c74ed5
2021-11-20 00:09:28 +00:00
Yuntao Xu
77bd4841a7 Merge "Revert^2 "Add seapp_contexts to allowlist of makefile goal"" am: ac69c239d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897105

Change-Id: I1287df30c9214a5e327cd1a977bdcbcb39fa7827
2021-11-20 00:08:48 +00:00
Colin Cross
a3675380c6 Merge "Move apex module installation into Soong" am: 50f6f869a2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1896051

Change-Id: I71788a834e4b97d3d1a812df70f570682ab8d6e2
2021-11-20 00:08:26 +00:00
Treehugger Robot
ec014011ea Merge "sbox: run commands using script for large commands" 2021-11-19 22:06:02 +00:00
Colin Cross
3d56ed5605 Prepend header jar for sharded javac compilation
When compiling without sharding javac will prefer classes built from
source over classes in the classpath.  Compiling with sharding puts
the header classes for all the sources onto the classpath, including
the sources that are not part of the current shard.  Emulate the
behavior when building without sharding by putting the header jar
first on the classpath so classes are resolved from the rest of
the sources before the real classpath.

Also switch to using the header jar without static libs dependencies
merged in, as those will already be present in the classpath.

Test: m framework-minus-apex
Test: m services.core
Test: TestSharding
Change-Id: Id11b39c15d89ce70da27d746a5c7e6b603c3c0f9
2021-11-19 21:57:21 +00:00
Colin Cross
6340ea50d4 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 and I606286e971b55d9d1fc4dcd0fbd476962de5fa79
with a fix for reversed logic.

Bug: 204136549
Test: m checkbuild
Change-Id: Ie65c53ebc7911efacdb8e11ba49059448f03c658
2021-11-19 13:37:36 -08:00
Colin Cross
500bba1b20 Merge "Revert "Move apex module installation into Soong"" 2021-11-19 21:33:46 +00:00
Colin Cross
555c52491d Revert "Move apex module installation into Soong"
This reverts commit 246e3eed67.

Reason for revert: broke aosp_bonito-userdebug build

Change-Id: Ib613f8f22532fe4588d3ec96aa001de869f8a633
2021-11-19 21:32:54 +00:00
Yuntao Xu
ac69c239d1 Merge "Revert^2 "Add seapp_contexts to allowlist of makefile goal"" 2021-11-19 19:24:55 +00:00
Colin Cross
50f6f869a2 Merge "Move apex module installation into Soong" 2021-11-19 19:24:02 +00:00
Treehugger Robot
ef9ba0896b Merge "A script to update the file contents with the command output." am: 71fe2cc783
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1895960

Change-Id: Ifc8a2d07ba8af11e9f3540dbe2c2cd3a0ffe6d1a
2021-11-19 03:32:12 +00:00
Treehugger Robot
71fe2cc783 Merge "A script to update the file contents with the command output." 2021-11-19 03:12:12 +00:00
Colin Cross
cf0dd40fb3 Merge changes from topic "app_set" am: 25f15a18e5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1893517

Change-Id: I292481d4d1729e657c39283f0f0804ec77fce70a
2021-11-19 02:33:56 +00:00
Colin Cross
25f15a18e5 Merge changes from topic "app_set"
* changes:
  Install android_app_set modules in Soong
  Extract primary apk from apk set zip
2021-11-19 02:18:20 +00:00
Sasha Smundak
82b6e8483c A script to update the file contents with the command output.
Used to avoid rerunning Ninja files regeneration if m2rbc conversion
generated the same makefile.

Test: treehugger
Change-Id: I1b0a619f961e6d2c7bf99a48053ecb58147c6db0
2021-11-18 15:15:45 -08:00
Yuntao Xu
feb0756d41 Revert^2 "Add seapp_contexts to allowlist of makefile goal"
e87a81673e

Change-Id: I461f3ecdd0b0ea0a4b7b12531cf8b561e170df55
2021-11-18 22:33:02 +00:00
Treehugger Robot
327d49367c Merge changes from topics "dist_for_goals", "mk2star" am: f18bedf1c3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890800

Change-Id: I037ac23b7df5461c2a34eb1352d8fe2126c98d9c
2021-11-18 22:23:51 +00:00
Sasha Smundak
b328bbf7ca Convert dist-for-goals. am: d679785d0d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1892884

Change-Id: Ic7049839161fa017e951e888fa18fdc4db871594
2021-11-18 22:23:49 +00:00
Treehugger Robot
f18bedf1c3 Merge changes from topics "dist_for_goals", "mk2star"
* changes:
  Generate runtime conversion diagnostics
  Convert dist-for-goals.
2021-11-18 22:04:52 +00:00
Treehugger Robot
55819bf0ca Merge "Simplify equality expressions when comparing to "true"" am: 7868f6818e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1894635

Change-Id: Ie6c9deda6d329c77786533475477d47dbd8281c8
2021-11-18 21:52:58 +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
Treehugger Robot
7868f6818e Merge "Simplify equality expressions when comparing to "true"" 2021-11-18 21:11:17 +00:00
Cole Faust
f1f44d3d21 Simplify equality expressions when comparing to "true"
If a boolean type is compared to a string literal with
the value "true", it should just output that boolean
type unchanged (or prefixed with "not" if ifneq).

Fixes: 206637085
Test: go test
Change-Id: I0c116bb68b96d21ba3783c01fc4ca524aaa04143
2021-11-18 10:15:26 -08:00
Vova Sharaienko
fca78780d4 Merge "Revert "Add seapp_contexts to allowlist of makefile goal"" am: 030878a492
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1896452

Change-Id: Ie7d1b7e20af0c35fb2181a36d3b69ac3a466ac99
2021-11-18 18:12:59 +00:00
Sasha Smundak
d679785d0d Convert dist-for-goals.
Bug: 198496782
Test: internal
Change-Id: I64ae938a5809238c18aca272ba73e4328fcb9efe
2021-11-18 10:01:37 -08:00
Sasha Smundak
422b614355 Generate runtime conversion diagnostics
Instead of inserting a comment with error description into the generated code,
generate a call to a function that will print out a conversion error when executed.
Do not print generic "partially converted" message anymore.
Remove --verbose and --no_warnings options.

Bug: 204062171
Test: internal
Change-Id: Ib126e16dc76f49635e4939e670922f2561781049
2021-11-18 10:01:37 -08:00
Vova Sharaienko
030878a492 Merge "Revert "Add seapp_contexts to allowlist of makefile goal"" 2021-11-18 17:56:09 +00:00
Vova Sharaienko
e87a81673e Revert "Add seapp_contexts to allowlist of makefile goal"
Revert submission 1795972-Convert security/Android.mk to Android.bp

Reason for revert: http://b/206976319 Broken build 7928060 on aosp-master on sdk_arm64-sdk
Reverted Changes:
I0e0e7f677:Split property and file contexts modules
I5596d6f00:Add seapp_contexts to allowlist of makefile goal
If685e5ccc:Convert security/Android.mk to Android.bp

Change-Id: I8cf8c0bc2f88172bb3bfa850bbd7ce6daa170c3d
2021-11-18 17:29:01 +00:00
Yuntao Xu
02c78d304c Merge "Add seapp_contexts to allowlist of makefile goal" am: cd6c3cd868
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1876178

Change-Id: Icd2ffd1c102cad493b6a95367c80cfa5afb50254
2021-11-18 17:21:20 +00:00
Yuntao Xu
cd6c3cd868 Merge "Add seapp_contexts to allowlist of makefile goal" 2021-11-18 17:05:46 +00:00
Victor Hsieh
da8747cee6 Merge "Revert "Include compos-module-sdk in the SDK build."" am: 83742ea9e9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1894197

Change-Id: Ie2cb545536b94d38b5a623b0dd0447a1cabd58bb
2021-11-18 16:07:32 +00:00
Victor Hsieh
83742ea9e9 Merge "Revert "Include compos-module-sdk in the SDK build."" 2021-11-18 15:47:01 +00:00
Colin Cross
50ed1f9ccb Install android_app_set modules in Soong
Add support for installing extra files from a zip file when installing
a primary file, and use it to support installing android_app_set modules,
which install a primary APK and then an unknown set of additional splits
APKs.

Test: app_set_test.go
Test: install test android_app_set
Bug: 204136549
Change-Id: Ia92f7e5c427adcef3bcf59c82a2f83450905c01d
2021-11-17 19:55:33 -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
Chih-hung Hsieh
933e7014da Revert "Revert "Switch to clang-r437112""
This reverts commit 1973f4d2cc.

Reason for revert: try to fix the failed test

Change-Id: I70b6e32d45db9e272432c85233cbf38e1e38a6ad
Bug: 201432564
2021-11-17 22:53:25 +00:00
Daniel Norman
33f4a18254 Revert "Revert "Adds multi_install_skip_symbol_files field (defa..." am: 6cfb37af56
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1894202

Change-Id: Ifeb6052c45b009fc0594855a2aa0b08ac977a6d9
2021-11-17 21:38:45 +00:00
Florian Mayer
753dd32123 Enable hwasan use after scope detection.
Test: flash & boot flame_hwasan-userdebug
Test: run parts of CTS on flame_hwasan-userdebug

Bug: 184289082
Bug: 172507966
Change-Id: I520bf57df57df45a63bc06a47462d6dc9a541828
2021-11-17 19:55:55 +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
TreeHugger Robot
e8130209b4 Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master 2021-11-17 18:58:09 +00:00
Ivan Lozano
c1c945c471 Merge "rust: Add rust_toolchain_library module." am: 9fdba2844e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1892856

Change-Id: Ic865655bd6f5075c76f0ca0cce2df1871c85bf72
2021-11-17 17:04:28 +00:00
Treehugger Robot
a163adfb80 Merge "Add bp2build_metrics" am: c131480634
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885928

Change-Id: I6de55430018bd63cd4908cde376dbf5bb0db3704
2021-11-17 17:04:18 +00:00
Ivan Lozano
9fdba2844e Merge "rust: Add rust_toolchain_library module." 2021-11-17 16:59:15 +00:00
Treehugger Robot
c131480634 Merge "Add bp2build_metrics" 2021-11-17 16:43:26 +00:00
Treehugger Robot
f27ed4b546 Merge "Revert "Switch to clang-r437112"" am: 88560585be
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1895137

Change-Id: I2361b2dba1d32ac01b45d638c4e23324f50b12f3
2021-11-17 15:39:05 +00:00
Alan Stokes
bcd567ea12 Make CompOS library optional in PRODUCT_APEX_SYSTEM_SERVER_JARS
CompOS is an optional module so it may legitimately be omitted from
some products.

Bug: 199147668
Test: Builds if PRODUCT_ISOLATED_COMPILATION_ENABLED not set
Change-Id: I4e031ca6184d920b64f9c370d35b5525ecbe8a1f
2021-11-17 15:37:14 +00:00
Treehugger Robot
88560585be Merge "Revert "Switch to clang-r437112"" 2021-11-17 15:23:44 +00:00
Martin Stjernholm
1973f4d2cc Revert "Switch to clang-r437112"
This reverts commit 0d58894613.

Reason for revert: Suspected culprit for test failure b/206716119

Change-Id: Ibdd0aa783e07df5b41fd804efd175c12a7fe6592
2021-11-17 12:23:49 +00:00