StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,541 Commits 1 Branch 0 Tags
c43bb629e589b01430bfd0c1599a37292521fb05
Commit Graph

54541 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sorin Basca
c43bb629e5 Merge "Revert "Setting Java 11 as the default version"" am: e7421c15dd am: a0abe6e74e am: cee0e6bf57 am: 902ad4c260 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1956197

Change-Id: Ie3984b088be52bf07333c174e6c931e390f9f471
 2022-01-20 16:57:02 +00:00
Sorin Basca
902ad4c260 Merge "Revert "Setting Java 11 as the default version"" am: e7421c15dd am: a0abe6e74e am: cee0e6bf57 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1956197

Change-Id: I8a7c49f1a5cd48b868813cd54dafa42c1ab8c8fd
 2022-01-20 16:39:24 +00:00
Sorin Basca
cee0e6bf57 Merge "Revert "Setting Java 11 as the default version"" am: e7421c15dd am: a0abe6e74e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1956197

Change-Id: I69d4f8be013034781a6161c49cc2d17861dc4dfe
 2022-01-20 16:23:47 +00:00
Sorin Basca
a0abe6e74e Merge "Revert "Setting Java 11 as the default version"" am: e7421c15dd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1956197

Change-Id: I9c756b6b3a9613e867cffdc0c8d957ab64078714
 2022-01-20 16:04:38 +00:00
Sorin Basca
e7421c15dd Merge "Revert "Setting Java 11 as the default version"" 2022-01-20 15:38:50 +00:00
Sorin Basca
8d3e0bb25e Revert "Setting Java 11 as the default version" 
Revert submission 1944928-default-java11

Reason for revert: Post-submit failures
Reverted Changes:
Ia9a0aa2a4:Setting Java 11 as the default version
Ibf5d10521:Setting Java 11 as the default version

Fixes: 215504708
Fixes: 215502091
Fixes: 215502091
Change-Id: I2f9866deff41406aede24758f6eda5e5808c7f29
 2022-01-20 15:37:11 +00:00
Sorin Basca
471c660a4d Merge "Setting Java 11 as the default version" am: 2c32bbfd73 am: cc0930b609 am: fe7d51f352 am: 9ac9f195d2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1946707

Change-Id: I0b4cfadabc1b7d8b0b6944e374bae74c8c4770f3
 2022-01-20 11:24:28 +00:00
Sorin Basca
9ac9f195d2 Merge "Setting Java 11 as the default version" am: 2c32bbfd73 am: cc0930b609 am: fe7d51f352 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1946707

Change-Id: Ie1f4348448c32b79d53c1e7c1081003e5e5b2049
 2022-01-20 11:10:30 +00:00
Sorin Basca
fe7d51f352 Merge "Setting Java 11 as the default version" am: 2c32bbfd73 am: cc0930b609 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1946707

Change-Id: I2ee5be70e22e374921057c9f172de8b02862df78
 2022-01-20 10:57:05 +00:00
Sorin Basca
cc0930b609 Merge "Setting Java 11 as the default version" am: 2c32bbfd73 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1946707

Change-Id: Iba59feaf0f8df1d2a06e3f3dd66801f5e04f8539
 2022-01-20 09:12:32 +00:00
Sorin Basca
2c32bbfd73 Merge "Setting Java 11 as the default version" 2022-01-20 09:00:32 +00:00
Maciej Żenczykowski
66b25d3ec4 Merge changes from topic "presubmit-am-af01f7e0248d4a05b7ebf1033e70cc95" 
* changes:
  [automerge] [NETD-BPF#34] Add a tag for bpf to specify the install folder 2p: 6320efb56e
  [NETD-BPF#34] Add a tag for bpf to specify the install folder
 2022-01-19 18:57:47 +00:00
Jingwen Chen
eefba215b9 Merge "Support multilib in apex." am: 539d41b686 am: 2cda5749f4 am: e1fc6a20ca am: 3ded2c64ee 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1932025

Change-Id: I214abe526ce8cb21dfba6b00ffa1ed284504644b
 2022-01-19 12:13:09 +00:00
Jingwen Chen
3ded2c64ee Merge "Support multilib in apex." am: 539d41b686 am: 2cda5749f4 am: e1fc6a20ca 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1932025

Change-Id: I9c6d927709f20eb77cf083f81f2616d27e784697
 2022-01-19 12:00:41 +00:00
Jingwen Chen
e1fc6a20ca Merge "Support multilib in apex." am: 539d41b686 am: 2cda5749f4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1932025

Change-Id: Ia251d14ae2344eff2caf409e32e4d9b3712d4ea3
 2022-01-19 11:49:14 +00:00
Jingwen Chen
2cda5749f4 Merge "Support multilib in apex." am: 539d41b686 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1932025

Change-Id: I10a15ca73d2675ad90dedfc03798bd9fc6d36fa8
 2022-01-19 11:33:01 +00:00
Jingwen Chen
539d41b686 Merge "Support multilib in apex." 2022-01-19 11:11:05 +00:00
Treehugger Robot
ad6fae4930 Merge "[NETD-BPF#34] Add a tag for bpf to specify the install folder" am: a9a5d36884 am: 9624d183f4 am: 7b49b608f6 am: 1a1604f9c6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1888356

Change-Id: Ic82782a7a0f56a34881961cdee2b4c82bff893e5
 2022-01-19 10:51:55 +00:00
Treehugger Robot
1a1604f9c6 Merge "[NETD-BPF#34] Add a tag for bpf to specify the install folder" am: a9a5d36884 am: 9624d183f4 am: 7b49b608f6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1888356

Change-Id: If517d9c901a34d8306039fa8ff72097f86aeff25
 2022-01-19 10:33:12 +00:00
Treehugger Robot
7b49b608f6 Merge "[NETD-BPF#34] Add a tag for bpf to specify the install folder" am: a9a5d36884 am: 9624d183f4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1888356

Change-Id: Iad2da65006ea674ee64f525e1d40366b5b68f810
 2022-01-19 10:16:31 +00:00
Treehugger Robot
9624d183f4 Merge "[NETD-BPF#34] Add a tag for bpf to specify the install folder" am: a9a5d36884 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1888356

Change-Id: Ia51d901307ff3076f00f297c00795e94328f6c01
 2022-01-19 09:59:57 +00:00
Treehugger Robot
a9a5d36884 Merge "[NETD-BPF#34] Add a tag for bpf to specify the install folder" 2022-01-19 09:41:57 +00:00
Presubmit Automerger Backend
39369dc3b8 [automerge] [NETD-BPF#34] Add a tag for bpf to specify the install folder 2p: 6320efb56e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16235230

Bug: 202086915
Change-Id: I27654d752c030b4317e967f496424378423784d8
 2022-01-19 08:04:10 +00:00
Ken Chen
6320efb56e [NETD-BPF#34] Add a tag for bpf to specify the install folder 
Currently, the bpf module netd.o (source system/netd/bpf_progs/netd.c)
will be built to /system/etc/bpf/netd.o. In Android T, it will be moved
to mainline module com.android.tethering.

The expected behavior is:
- In T device, it uses the netd.o in mainline module.
- In pre-T devices, it uses the original netd, built from platform.

However, netd.o will be double loaded if the tethering module is
installed in Pre-T devices. Because:
1. bpf in apex is packed into /apex/MAINLINE_MODULE/etc/bpf/
2. bpf in platform is packed into /system/etc/bpf/
3. bpfloader in pre-T loads ANY bpf modules under
/apex/com.android.tethering/etc/bpf/ and /system/etc/bpf/.

We can't change the behavior of bpfloader in pre-T devices. We can't
delete the /system/etc/bpf/netd.o from pre-T devices. Both of them are
not mainline modules. So the mainlined netd.o needs to be packed into a
folder other than /apex/com.android.tethering/etc/bpf/ or
/system/etc/bpf/.

This commit adds a tag 'sub_dir' for bpf module. The installation path
of bpf modules will be:
- /system/etc/bpf/SUB_DIR/     (for platform code)
- /apex/MAINLINE_MODULE/etc/bpf/SUB_DIR/     (for mainline module)

Bug: 202086915
Test: add test in apex_test.go and build
Merged-In: Icc6619768ab006de9f86620a7df1bb2853eaba13
Change-Id: Icc6619768ab006de9f86620a7df1bb2853eaba13
 2022-01-19 08:04:00 +00:00
Pirama Arumuga Nainar
c958c40e1c Merge "Revert memory mapped coverage" am: 3ae0b5a7c1 am: 7a1dbabc40 am: ebfac819ee am: 028a581787 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1953529

Change-Id: I4731d737ffdae6873a1749b1c2f8956ed16e2ff7
 2022-01-19 07:09:47 +00:00
Pirama Arumuga Nainar
028a581787 Merge "Revert memory mapped coverage" am: 3ae0b5a7c1 am: 7a1dbabc40 am: ebfac819ee 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1953529

Change-Id: Iae9f3bafc0c8398d9504be86a3c5c66ec24bd8db
 2022-01-19 06:51:32 +00:00
Pirama Arumuga Nainar
ebfac819ee Merge "Revert memory mapped coverage" am: 3ae0b5a7c1 am: 7a1dbabc40 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1953529

Change-Id: I8b3bfb2aaee3988c07669a759c242fe6d156ffe1
 2022-01-19 06:33:30 +00:00
Pirama Arumuga Nainar
7a1dbabc40 Merge "Revert memory mapped coverage" am: 3ae0b5a7c1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1953529

Change-Id: Ib0b184ea97847976938458d727d16eba3ade9885
 2022-01-19 06:18:25 +00:00
Pirama Arumuga Nainar
3ae0b5a7c1 Merge "Revert memory mapped coverage" 2022-01-19 06:03:26 +00:00
Ken Chen
fad7f9d8b7 [NETD-BPF#34] Add a tag for bpf to specify the install folder 
Currently, the bpf module netd.o (source system/netd/bpf_progs/netd.c)
will be built to /system/etc/bpf/netd.o. In Android T, it will be moved
to mainline module com.android.tethering.

The expected behavior is:
- In T device, it uses the netd.o in mainline module.
- In pre-T devices, it uses the original netd, built from platform.

However, netd.o will be double loaded if the tethering module is
installed in Pre-T devices. Because:
1. bpf in apex is packed into /apex/MAINLINE_MODULE/etc/bpf/
2. bpf in platform is packed into /system/etc/bpf/
3. bpfloader in pre-T loads ANY bpf modules under
/apex/com.android.tethering/etc/bpf/ and /system/etc/bpf/.

We can't change the behavior of bpfloader in pre-T devices. We can't
delete the /system/etc/bpf/netd.o from pre-T devices. Both of them are
not mainline modules. So the mainlined netd.o needs to be packed into a
folder other than /apex/com.android.tethering/etc/bpf/ or
/system/etc/bpf/.

This commit adds a tag 'sub_dir' for bpf module. The installation path
of bpf modules will be:
- /system/etc/bpf/SUB_DIR/     (for platform code)
- /apex/MAINLINE_MODULE/etc/bpf/SUB_DIR/     (for mainline module)

Bug: 202086915
Test: add test in apex_test.go and build
Change-Id: Icc6619768ab006de9f86620a7df1bb2853eaba13
 2022-01-19 04:02:29 +00:00
Treehugger Robot
944f5122c4 Merge "Allow tools/vendor to build rust" am: 706ab94ee7 am: 847d13a662 am: 448d71d43f am: 6e927801f0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1953127

Change-Id: Ic3f08ff192ae181572a9bb5f6939156cda73f060
 2022-01-18 23:10:02 +00:00
Treehugger Robot
6e927801f0 Merge "Allow tools/vendor to build rust" am: 706ab94ee7 am: 847d13a662 am: 448d71d43f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1953127

Change-Id: I2307ae786bfc6e162f4d50faddd5550ae0c57cde
 2022-01-18 22:54:31 +00:00
Treehugger Robot
448d71d43f Merge "Allow tools/vendor to build rust" am: 706ab94ee7 am: 847d13a662 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1953127

Change-Id: Ib7d05b57fab035f4a85efd03d857568aba0b079c
 2022-01-18 22:35:45 +00:00
Treehugger Robot
847d13a662 Merge "Allow tools/vendor to build rust" am: 706ab94ee7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1953127

Change-Id: I590a796cc09b130d90059a5bef3292e6e97019da
 2022-01-18 22:19:38 +00:00
Treehugger Robot
706ab94ee7 Merge "Allow tools/vendor to build rust" 2022-01-18 22:04:14 +00:00
Pirama Arumuga Nainar
aa966c5630 Revert memory mapped coverage 
Bug: http://b/194128476
Bug: http://b/210012154

Reverts:
e6840726bd "[coverage] Override -Wframe-larger-than"
71d697c5cb "Enable memory-mapped coverage instrumentation"

Coverage metrics dropped for ~10 of the 40 modules.  There are also
regressions in mainline when running tests on older platform builds.

Test: presubmit
Change-Id: I4a2b005d3b54764b762b5422e03b7a9ec8727227
 2022-01-18 13:13:47 -08:00
Yu Liu
4ae55d17f6 Support multilib in apex. 
Bug: b/208325023
Test: Added unit tests, also tested with adbd apex build manually.
Change-Id: I47e04cd4eb5d05227f0a84683dcb66dff00e3514
 2022-01-18 10:38:05 -08:00
Richard Fung
3d11a5698a Allow tools/vendor to build rust 
This is necessary to move the mk_payload package from
packages/modules/Virtualization/microdroid to an ARC owned directory.

Bug: 196891323
Test: m -j
Change-Id: Ifa3e509fb4ffa7861e45f69dd4654e8fbe1677ff
 2022-01-18 18:26:35 +00:00
Treehugger Robot
dcf1818268 Merge "Add missing team members to OWNERS" am: 54f311d0fb am: 2f4a63a7b1 am: c565ed68b9 am: a23fd610e2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1949963

Change-Id: Ideea6a0f195673e1f46efa5670642cd447a28cd1
 2022-01-18 16:21:54 +00:00
Treehugger Robot
a23fd610e2 Merge "Add missing team members to OWNERS" am: 54f311d0fb am: 2f4a63a7b1 am: c565ed68b9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1949963

Change-Id: I3963d1f8966026794bb64d3fb7f673612ffec214
 2022-01-18 16:02:15 +00:00
Treehugger Robot
c565ed68b9 Merge "Add missing team members to OWNERS" am: 54f311d0fb am: 2f4a63a7b1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1949963

Change-Id: I8da8ad9a94a1ebc3b3e39f36540274b2ed3998f2
 2022-01-18 15:47:30 +00:00
Treehugger Robot
2f4a63a7b1 Merge "Add missing team members to OWNERS" am: 54f311d0fb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1949963

Change-Id: I51ebb20d0183fd8d587e8a9e06db3bc168e5fcec
 2022-01-18 15:33:21 +00:00
Treehugger Robot
54f311d0fb Merge "Add missing team members to OWNERS" 2022-01-18 15:14:41 +00:00
Treehugger Robot
c8d602843e Merge "Implement stubs.symbol_file and stubs.versions for cc_library_shared bp2build." am: 9e46741e73 am: d3066c7de1 am: 8c48fac4eb am: f5b0c2299f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940900

Change-Id: Id5315c3041665b906efd909b29ec179b200a1c5a
 2022-01-18 11:52:25 +00:00
Treehugger Robot
f5b0c2299f Merge "Implement stubs.symbol_file and stubs.versions for cc_library_shared bp2build." am: 9e46741e73 am: d3066c7de1 am: 8c48fac4eb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940900

Change-Id: I7a60b1b0207d7af3bf5c2372b72d09963aa609cc
 2022-01-18 11:37:45 +00:00
Treehugger Robot
8c48fac4eb Merge "Implement stubs.symbol_file and stubs.versions for cc_library_shared bp2build." am: 9e46741e73 am: d3066c7de1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940900

Change-Id: I3ab3e6ea127a7da8850974675b1813294b1a83ea
 2022-01-18 10:55:23 +00:00
Treehugger Robot
d3066c7de1 Merge "Implement stubs.symbol_file and stubs.versions for cc_library_shared bp2build." am: 9e46741e73 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940900

Change-Id: I8d043580d374b2a82dbc78b718dcb86d805119d6
 2022-01-18 10:19:12 +00:00
Treehugger Robot
9e46741e73 Merge "Implement stubs.symbol_file and stubs.versions for cc_library_shared bp2build." 2022-01-18 10:02:55 +00:00
Sorin Basca
171c2103b8 Setting Java 11 as the default version 
Test: m
Change-Id: Ia9a0aa2a4aa02d7b67ad8e1cb6083d33c3d75e70
 2022-01-18 09:05:34 +00:00
Kousik Kumar
b39110b8dd Merge "Add additional directories from which env config can be loaded" am: 07d858468e am: 5b34d48a92 am: 4d493fdfda am: 60a45dfec1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1949705

Change-Id: I9abdeee23c55aff199bdae4cb185189ec1aff9c6
 2022-01-17 17:06:53 +00:00