StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,408 Commits 1 Branch 0 Tags
0118e502de2a372e29e585aed3d6f4677d56a38d
Commit Graph

48408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Cross
0118e502de Merge "Move apex module installation into Soong" am: 50f6f869a2 am: a3675380c6 am: 0cc52a39ba 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1896051

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

Change-Id: I0ee4f3d90dfb6dca31aca303c1487c6c74d266d3
 2021-11-20 02:15:08 +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
Colin Cross
50f6f869a2 Merge "Move apex module installation into Soong" 2021-11-19 19:24:02 +00:00
Treehugger Robot
e35897e7d8 Merge "A script to update the file contents with the command output." am: 71fe2cc783 am: ef9ba0896b am: 06eeaa24b9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1895960

Change-Id: Ife70e7739affaf5d00e3791251a3e9d285d6e25c
 2021-11-19 04:02:05 +00:00
Treehugger Robot
06eeaa24b9 Merge "A script to update the file contents with the command output." am: 71fe2cc783 am: ef9ba0896b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1895960

Change-Id: I5214c0c6e357886edf29e23c129b5e2b0d5aac4b
 2021-11-19 03:45:49 +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
Colin Cross
6bf007ed59 Merge changes from topic "app_set" am: 25f15a18e5 am: cf0dd40fb3 am: 80547efe96 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1893517

Change-Id: I1a493deb2175d66150d50e741319df1cd9fa6c46
 2021-11-19 03:19:03 +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
80547efe96 Merge changes from topic "app_set" am: 25f15a18e5 am: cf0dd40fb3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1893517

Change-Id: I0348caf9bf02422c844a7d68cfd288f858deead5
 2021-11-19 02:58:27 +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
Treehugger Robot
8328b1debb Merge changes from topics "dist_for_goals", "mk2star" am: f18bedf1c3 am: 327d49367c am: 206f6343d1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890800

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

Change-Id: Ib51c3ac863624b79221527ee3ec9cf87357f6e74
 2021-11-18 23:03:57 +00:00
Treehugger Robot
206f6343d1 Merge changes from topics "dist_for_goals", "mk2star" am: f18bedf1c3 am: 327d49367c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890800

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

Change-Id: Idc44fb7c7e1a1e2b2010c70b20f255fef451a687
 2021-11-18 22:46:45 +00:00
Treehugger Robot
5b1e43e678 Merge "Simplify equality expressions when comparing to "true"" am: 7868f6818e am: 55819bf0ca am: e68a4d72d4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1894635

Change-Id: I1f0181dba4982efa67c4d8943e621440c2c5ba8d
 2021-11-18 22:34:29 +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
e68a4d72d4 Merge "Simplify equality expressions when comparing to "true"" am: 7868f6818e am: 55819bf0ca 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1894635

Change-Id: Ie78cc7277f579f0258445266130a4137a118852a
 2021-11-18 22:10:28 +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
Vova Sharaienko
9f04bd0642 Merge "Revert "Add seapp_contexts to allowlist of makefile goal"" am: 030878a492 am: fca78780d4 am: 547a9f5059 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1896452

Change-Id: I382cee7ad387d5429f8a6936a12f37e7b44c3a5e
 2021-11-18 18:57:11 +00:00
Vova Sharaienko
547a9f5059 Merge "Revert "Add seapp_contexts to allowlist of makefile goal"" am: 030878a492 am: fca78780d4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1896452

Change-Id: I8e0a9d95b83072ac76b03f61c6ef82510dc26cc8
 2021-11-18 18:32:42 +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
Yuntao Xu
1c2907dc7c Merge "Add seapp_contexts to allowlist of makefile goal" am: cd6c3cd868 am: 02c78d304c am: 20cc4f0a1d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1876178

Change-Id: I6169766d7bd3ba005139b78255f02f1250f8f317
 2021-11-18 18:00:37 +00:00
Vova Sharaienko
030878a492 Merge "Revert "Add seapp_contexts to allowlist of makefile goal"" 2021-11-18 17:56:09 +00:00
Yuntao Xu
20cc4f0a1d Merge "Add seapp_contexts to allowlist of makefile goal" am: cd6c3cd868 am: 02c78d304c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1876178

Change-Id: I0cdc770e3d544edf61deb89365de5eae006a318a
 2021-11-18 17:45:15 +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
54cbc70be3 Merge "Revert "Include compos-module-sdk in the SDK build."" am: 83742ea9e9 am: da8747cee6 am: 40b9a79e2b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1894197

Change-Id: I27e1ad0c805f20dfe01ed2fed16f8bca3f507851
 2021-11-18 16:46:51 +00:00
Victor Hsieh
40b9a79e2b Merge "Revert "Include compos-module-sdk in the SDK build."" am: 83742ea9e9 am: da8747cee6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1894197

Change-Id: I2da3928ca1f33e46aafb5150e7f25a710214217b
 2021-11-18 16:30:17 +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
Daniel Norman
a4aab6c90d Revert "Revert "Adds multi_install_skip_symbol_files field (defa..." am: 6cfb37af56 am: 33f4a18254 am: 79454a7405 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1894202

Change-Id: I85c41a9929a4d7a8871a0e6673eb0108c94e9865
 2021-11-17 21:48:21 +00:00
Daniel Norman
79454a7405 Revert "Revert "Adds multi_install_skip_symbol_files field (defa..." am: 6cfb37af56 am: 33f4a18254 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1894202

Change-Id: I68332b7433e2729d61b5fc527bd16edfd732c298
 2021-11-17 21:42:28 +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
TreeHugger Robot
4efcc4ff3f [automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: e8130209b4 -s ours am: b4d7ba21c9 -s ours 
am skip reason: Merged-In I6998afd2638ea87773ed52a90b7ec62d5abebc14 with SHA-1 4841f6ffda is already in history

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

Change-Id: Id679c927299ca0bb9529ebb5b098289595f18bd1
 2021-11-17 19:47:40 +00:00
TreeHugger Robot
b4d7ba21c9 [automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: e8130209b4 -s ours 
am skip reason: Merged-In I6998afd2638ea87773ed52a90b7ec62d5abebc14 with SHA-1 4841f6ffda is already in history

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

Change-Id: I018756740ad8d6ae622a0206a356d38728aa372c
 2021-11-17 19:32:03 +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