tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
46663 commits 1 branch 0 tags 115 MiB
Commit graph

46663 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
Treehugger Robot
817724812d Merge "Quote aquery commands." am: 245b1bf4dc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1894223

Change-Id: I87ff6710e1bb1327cf18855267807f6e74911fbd
 2021-11-17 01:46:05 +00:00
Treehugger Robot
2cfe9c9686 Merge "Update platform_apis error message" am: a7f0c39214 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1893228

Change-Id: I7d8d4b5fc89657bc544206b0f3be868604b49456
 2021-11-17 01:45:55 +00:00
Treehugger Robot
245b1bf4dc Merge "Quote aquery commands." 2021-11-17 01:35:07 +00:00
Treehugger Robot
a7f0c39214 Merge "Update platform_apis error message" 2021-11-17 01:29:28 +00:00
Treehugger Robot
24c800dd23 Merge "Switch to clang-r437112" am: 6515910b4f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885449

Change-Id: I516cc21196b8e4242245ab5f614833b903a16226
 2021-11-16 23:16:09 +00:00
Treehugger Robot
6515910b4f Merge "Switch to clang-r437112" 2021-11-16 23:03:07 +00:00
Liz Kammer
c31929962b Quote aquery commands. 
Bazel run shell actions begin `bin/bash -c <command>`, without escaping,
the command can be treated as an argument to `bin/bash`.

Test: build/bazel/mixed_droid.sh
Change-Id: I423cb393da2e6ac97448ec77b2596f12670dfd31
 2021-11-16 17:31:05 -05:00
Yuntao Xu
1f311bb979 Merge "Handle license conversions in androidmk" am: ddeab21340 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1858735

Change-Id: Ic6cba47c8d8dddbc306ab643257921b3c831ec6d
 2021-11-16 22:08:58 +00:00
Yuntao Xu
ddeab21340 Merge "Handle license conversions in androidmk" 2021-11-16 21:51:35 +00:00
Wei Li
d8812610ba Fix the output handling of Bazel aquery for py_binary targets so soong's python_binary_host modules can be converted to py_binary and built with Bazel dependent targets in mixed build. am: 455ba83a94 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1881650

Change-Id: Iee632d704beca6b4e4f278e02bcc48967940992f
 2021-11-16 21:03:41 +00:00
Wei Li
455ba83a94 Fix the output handling of Bazel aquery for py_binary targets so soong's python_binary_host modules can be converted to py_binary and built with Bazel dependent targets in mixed build. 
Test: USE_BAZEL_ANALYSIS=1 m genfunctosyscallnrs
Test: USE_BAZEL_ANALYSIS=1 m func_to_syscall_nrs
Test: USE_BAZEL_ANALYSIS=1 m libseccomp_policy
Bug: 201094425
Bug: 197135289
Bug: 204949078
Change-Id: If98630830d687ca814d6ae09c1e610f2c3a371b1
 2021-11-16 20:49:28 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
142cc2e360 Add bp2build_metrics 
Through a .proto

Bug: 201539536
Test: m nothing
Test: {bp2build,mixed_{libc,droid}}.sh
Test: CI
Change-Id: I18d25eb8cd40c8a88d9ae79a85980b956194a0d4
 2021-11-16 14:48:45 -05:00
Yuntao Xu
214cdaf1d4 Handle license conversions in androidmk 
1. Support license conversions in the androidmk tool. More details can be
found at go/license-androidmk;
2. As usage examples, locally this functionality has been applied to
aosp/1881088 and aosp/1869664;

Bug: 202964622
Test: m androidmk
Test: manually ran androidmk <typical Android.mk files>
Test: TreeHugger
Change-Id: I7d5013d25ad8961e997109d0378f20f5085e0ecf
 2021-11-16 11:41:31 -08:00
Victor Hsieh
e4f0b0a090 Revert "Include compos-module-sdk in the SDK build." 
This reverts commit 5b817e642c.

Reason for revert: No longer needed

Bug: 203231943
Change-Id: I220ff6b2033cadf7b29f1bc4a68bec50900f2aef
 2021-11-16 19:17:42 +00:00
Chih-Hung Hsieh
0d58894613 Switch to clang-r437112 
* to test with build 7917927

Bug: 201432564
Test: make
Change-Id: Ic21f76f238abb2727e559ece41fd6cc76fb69f85
 2021-11-16 18:18:08 +00:00
Ivan Lozano
d6e91ece1b Merge "rust: Add Recovery Snapshot Soong tests for rust." am: aed0adfee9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1886523

Change-Id: Ie60800d326448c0c4171c8bf4695b7c5063ab056
 2021-11-16 14:06:44 +00:00
Ivan Lozano
1966b6156d Merge "rust: Add data_libs and data_bins to rust_test" am: b993a835c3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1883189

Change-Id: Ie22babb9c6144c2977fa10cd78908ba51793412b
 2021-11-16 14:06:38 +00:00
Ivan Lozano
45e0e5b012 rust: Add rust_toolchain_library module. 
Adds a new rust_toolchain_library module, a module which can compute the
source path from the toolchain root.

Bug: 140642453
Test: m

Change-Id: I2d90722880279533eb93d2d946ac8c31fc0b1835
 2021-11-16 08:51:48 -05:00
Ivan Lozano
aed0adfee9 Merge "rust: Add Recovery Snapshot Soong tests for rust." 2021-11-16 13:47:18 +00:00
Ivan Lozano
b993a835c3 Merge "rust: Add data_libs and data_bins to rust_test" 2021-11-16 13:46:49 +00:00
Owen Kim
dcf7a82e43 Merge "Revert "Adds multi_install_skip_symbol_files field (default fals..."" am: a10ebe60ab 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1893457

Change-Id: I73072fcf0e2b30baeea8536f39ef00a6a39ab3bd
 2021-11-16 08:55:12 +00:00