StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,301 Commits 1 Branch 0 Tags
b48abbcd564ae0c3bfcc2e764e4126cbfd3f90c6
Commit Graph

38301 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rupert Shuttleworth
b48abbcd56 Merge "Add initial bp2build support for converting android_app_certificate modules." am: 569a23ae00 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1780168

Change-Id: I761a55f9649783a7da1a9c117c962ef4461c3697
 2021-07-28 12:36:02 +00:00
Rupert Shuttleworth
5d80f5a189 Merge "Add support for prebuilts attribute to the bp2build APEX converter." am: 36a3ef297f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1781087

Change-Id: Ib1d3785780db20e98537a9e336013d8f5e8e77a6
 2021-07-28 12:35:44 +00:00
Rupert Shuttleworth
569a23ae00 Merge "Add initial bp2build support for converting android_app_certificate modules." 2021-07-28 12:26:26 +00:00
Rupert Shuttleworth
36a3ef297f Merge "Add support for prebuilts attribute to the bp2build APEX converter." 2021-07-28 12:25:10 +00:00
Yi Kong
4d6cdf5ac6 Merge "Fix build on older Macs with universal binary Clang" am: c14f088a5f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1775267

Change-Id: Id04c5da31aaa7c87f068cc3f17f168db3d3d1d4f
 2021-07-28 11:18:46 +00:00
Yi Kong
c14f088a5f Merge "Fix build on older Macs with universal binary Clang" 2021-07-28 11:05:00 +00:00
Rupert Shuttleworth
5c4881c8ec Add initial bp2build support for converting android_app_certificate modules. 
Test: Added unit test.

Change-Id: Ib5bf1711eca5be772e1bed73663dcb86252e0b4a
 2021-07-28 06:51:07 -04:00
Rupert Shuttleworth
9447e1ee12 Add support for prebuilts attribute to the bp2build APEX converter. 
Test: Updated unit test.

Change-Id: I73dfa84d7a55c0b94393ad6257b5f16313422852
 2021-07-28 06:03:17 -04:00
Rupert Shuttleworth
7ab55acf47 Merge "Add initial bp2build converter support for apex_key modules." am: 8e5b4c5043 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1778751

Change-Id: Idc3ff1c087d6d42929b9ea61536fa4ccdb54142c
 2021-07-28 07:45:43 +00:00
Rupert Shuttleworth
8e5b4c5043 Merge "Add initial bp2build converter support for apex_key modules." 2021-07-28 07:27:47 +00:00
Rupert Shuttleworth
eb8c85abf5 Add initial bp2build converter support for apex_key modules. 
Test: Added unit test.

Change-Id: I1ec2adfcef770ff91bcf35b89d9961f4d2b8a814
 2021-07-28 01:45:54 -04:00
Jooyung Han
ff29971e2c Merge "TransitivePackagingSpecs should follow "installable" deps" am: 1c534d3c73 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1775265

Change-Id: I3938d5e21488354f23d119edfa04f33e013614ee
 2021-07-28 00:51:20 +00:00
Jooyung Han
1c534d3c73 Merge "TransitivePackagingSpecs should follow "installable" deps" 2021-07-28 00:35:16 +00:00
Treehugger Robot
760a2a04ff Merge "Build mk2rbc and rbcrun during bootstrap" am: 06cf460f3c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1672465

Change-Id: I3fe8efcbc25e0cd4b19971a27a0ab30daa998979
 2021-07-27 19:44:00 +00:00
Treehugger Robot
06cf460f3c Merge "Build mk2rbc and rbcrun during bootstrap" 2021-07-27 19:05:22 +00:00
Ivan Lozano
65fe1b29b8 Merge "rust: Add vendor/ to allowed list." am: 6d58321f94 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1778835

Change-Id: I1c82e41b4abf5c8d8783985439c48aa37b2932ce
 2021-07-27 18:52:08 +00:00
Ivan Lozano
6d58321f94 Merge "rust: Add vendor/ to allowed list." 2021-07-27 18:30:43 +00:00
Sasha Smundak
7ae80a7044 Build mk2rbc and rbcrun during bootstrap 
Bug: 172923994
Test: treehugger
Change-Id: I6b552b40eecbaedd17b39ed5d00ca2a0b0772c81
 2021-07-27 10:27:43 -07:00
Ivan Lozano
dca00cb76b rust: Add vendor/ to allowed list. 
Bug: 191507775
Test: N/A
Change-Id: I077459f545d4a16de092a3cce27ce97afb76d514
 2021-07-27 11:58:38 -04:00
Rupert Shuttleworth
6de2c9b72b Add some more properties to the bp2build APEX converter (second try) am: 6e4950a061 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1778212

Change-Id: Ib311f676fe282bc4319aab63553f94d039402cd6
 2021-07-27 10:38:45 +00:00
Jooyung Han
8707cd74bf TransitivePackagingSpecs should follow "installable" deps 
Gathering packaging items from "SkipInstall" deps doesn't make sense.

Bug: 194403710
Test: soong test
Test: m microdroid # microdroid shouldn't have libandroidicu
Change-Id: If6c3ee82d588e2742c85cef7244c090c93f38b8e
 2021-07-27 19:26:10 +09:00
Rupert Shuttleworth
6e4950a061 Add some more properties to the bp2build APEX converter (second try) 
In particular:

- AndroidManifest
- file_contexts
- key
- certificate
- min_sdk_version
- updatable
- installable
- native_shared_libs
- binaries

Test: Updated unit test

Change-Id: I1c6e8c4b6b24ce487f64e5d37bd594dbb000fe6f
 2021-07-27 05:02:50 -04:00
Jiyong Park
c07a16ca1a Add more *-ndk libraries to VndkMustUseVendorVariantList 
Some libraries were missing in aosp/1777786.

Bug: 161456198
Bug: 194743866
Test: m on full-eng

Merged-In: I7c7aa1025a876e45fc4779378825d91098164e84
Change-Id: I3cb4dfcf490ddb6b4bd3915232399cebf5e467d5
 2021-07-27 17:25:40 +09:00
Treehugger Robot
86487af9f5 [automerger skipped] Merge "Add more *-ndk libraries to VndkMustUseVendorVariantList" am: 2695e20d57 -s ours 
am skip reason: Merged-In I7c7aa1025a876e45fc4779378825d91098164e84 with SHA-1 44a13ac401 is already in history

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

Change-Id: I54cbea111630b6d8344ab6b690f121a14801f643
 2021-07-27 04:31:06 +00:00
Treehugger Robot
2695e20d57 Merge "Add more *-ndk libraries to VndkMustUseVendorVariantList" 2021-07-27 04:15:51 +00:00
Rupert Shuttleworth
8ed074029d Merge "Revert "Add some more properties to the bp2build APEX converter."" am: d0e6ad1ab3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1778407

Change-Id: Ie7530b1580b4ed11bf62f5cc2af725ad3167f32c
 2021-07-27 03:12:49 +00:00
Rupert Shuttleworth
d0e6ad1ab3 Merge "Revert "Add some more properties to the bp2build APEX converter."" 2021-07-27 02:56:56 +00:00
Jiyong Park
6ede93608b Add more *-ndk libraries to VndkMustUseVendorVariantList 
Some libraries were missing in aosp/1777786.

Bug: 161456198
Bug: 194743866
Test: m on full-eng

Merged-In: I7c7aa1025a876e45fc4779378825d91098164e84
Change-Id: I3cb4dfcf490ddb6b4bd3915232399cebf5e467d5
 2021-07-27 02:56:43 +00:00
Treehugger Robot
5145dacc32 Merge changes I2b07c775,I4a562ccc am: ab8cdb0075 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1778589

Change-Id: If0c51eb463dd5d6ba2b01af4ad09126ad31c4c38
 2021-07-27 02:42:17 +00:00
Treehugger Robot
23c45bb446 Merge "Add some more properties to the bp2build APEX converter." am: 57dd3c40e8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1778085

Change-Id: I913c52ca4f6b3f6ad35a941459a6adc2282d8962
 2021-07-27 02:42:03 +00:00
Rupert Shuttleworth
0358478150 Revert "Add some more properties to the bp2build APEX converter." 
This reverts commit 69bf4c0d60.

Reason for revert: Possibly broke CI (https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master-bazel&target=bp2build-incremental&lkgb=7266256&fkbb=7237028), rolling back just in case...

Change-Id: I14ebac4f47576a73285d1f724ae4499036e8e678
 2021-07-27 02:37:32 +00:00
Treehugger Robot
ab8cdb0075 Merge changes I2b07c775,I4a562ccc 
* changes:
  Options processing: remove redundant check
  Do not flag as error 'define' directives for the known macros
 2021-07-27 02:24:51 +00:00
Treehugger Robot
57dd3c40e8 Merge "Add some more properties to the bp2build APEX converter." 2021-07-27 02:17:51 +00:00
Jiyong Park
20ab109f68 Merge changes from topic "remove_ndk_platform" am: 1b064ab3e7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1777786

Change-Id: I4c17e059df37993947cf4c61d439560dd0303fed
 2021-07-27 01:19:35 +00:00
Jiyong Park
fe9eee7747 Reland: Add more target-specific properties am: a592b6f8e0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1777785

Change-Id: Id26c90054a70e88e7ac94fe4b0d110160acabe25
 2021-07-27 01:19:34 +00:00
Jiyong Park
1b064ab3e7 Merge changes from topic "remove_ndk_platform" 
* changes:
  *-ndk.so libraries are added to VndkMustUseVendorVariantList
  Reland: Add more target-specific properties
 2021-07-27 01:01:58 +00:00
Treehugger Robot
8846c8876f Merge changes I19f0e104,I7994bee6 am: 2c405ff6ae 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1765127

Change-Id: I18aaf7478db8dd882f7497bf2aed61bf41291297
 2021-07-27 00:57:15 +00:00
Treehugger Robot
2c405ff6ae Merge changes I19f0e104,I7994bee6 
* changes:
  Emit mkpatsubst call for $(patsubst ...)
  Emit mksubst call for $(subst ...)
 2021-07-27 00:41:21 +00:00
Kousik Kumar
a7ab7c9394 Merge "Load RBE related env vars from config files" am: b3a5d18470 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1773209

Change-Id: Id84167a3ae6ab15c8b74b72b4cc2c179e0da5d0c
 2021-07-26 22:11:10 +00:00
Kousik Kumar
b3a5d18470 Merge "Load RBE related env vars from config files" 2021-07-26 21:57:49 +00:00
Kousik Kumar
51c4091309 Load RBE related env vars from config files 
This is as part of an effort to move environment variables into config
files so that configs can be tied down to source.

Test:
Ran a build with "ANDROID_BUILD_ENVIRONMENT_CONFIG=googler m"  which ran
a non-RBE build (since this is vanilla aosp).
Also ran a build with "ANDROID_BUILD_ENVIRONMENT_CONFIG= m" which ran a
non-RBE build.

https://paste.googleplex.com/5637282880028672

Bug: b/194679562
Change-Id: I416e8da75f84aa2b53995f525cf50501488dc972
 2021-07-26 21:55:25 +00:00
satayev
adb9e9f752 Merge "Rename UpdatableBootJars to ApexBootJars." am: 4102c0cc47 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1773912

Change-Id: Ife99a76ee653d4724184b92dddabe5a13a662c43
 2021-07-26 18:18:50 +00:00
Sasha Smundak
b2ac859a69 Options processing: remove redundant check 
Bug: 172923994
Test: N/A
Change-Id: I2b07c775f8e3cad78eb6992d3522bef3a9b701b8
 2021-07-26 11:12:04 -07:00
Sasha Smundak
94b41c76da Emit mkpatsubst call for $(patsubst ...) 
Bug: 172923994
Test: internal
Change-Id: I19f0e104d253230e603a098605736ac36e65818e
 2021-07-26 11:12:04 -07:00
Sasha Smundak
f3e072a87e Do not flag as error 'define' directives for the known macros 
Bug: 172923994
Test: internal
Change-Id: I4a562ccc1d14bd7d4e8a638823a62d775b056742
 2021-07-26 11:12:04 -07:00
satayev
4102c0cc47 Merge "Rename UpdatableBootJars to ApexBootJars." 2021-07-26 17:59:36 +00:00
Sasha Smundak
9d011abcd5 Emit mksubst call for $(subst ...) 
Bug: 172923994
Test: internal
Change-Id: I7994bee61f6f8bdee6eac50ecb8a6064830447a4
 2021-07-26 10:25:43 -07:00
Jingwen Chen
ccce36b584 bp2build BUILD files for build/bazel/examples/apex. am: b643c7a085 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1777787

Change-Id: I50637419cae1b215ba0ae1cb3897d668f848ec5d
 2021-07-26 11:56:41 +00:00
Rupert Shuttleworth
69bf4c0d60 Add some more properties to the bp2build APEX converter. 
In particular:

- AndroidManifest
- file_contexts
- key
- certificate
- min_sdk_version
- updatable
- installable
- native_shared_libs
- binaries

Test: Updated unit test

Change-Id: I9ea13f021d63ec0f75006b3b0b23ec8178c7e9da
 2021-07-26 07:32:36 -04:00
Jingwen Chen
b643c7a085 bp2build BUILD files for build/bazel/examples/apex. 
The previous build/bazel recursive glob is too aggressive. Not all
directories should be ignored by bp2build.

Test: bp2build-incremental builds //bionic/... and everything it depends on in //build/bazel/...
Bug: 193658718
Change-Id: Icb48fd687f0fe6be144caa5b8c9a4f01d15b6c20
 2021-07-26 06:26:36 +00:00