StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,311 Commits 1 Branch 0 Tags
d0ec532fa676fd7c851e5e88b45aa9d94a2295df
Commit Graph

44311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rupert Shuttleworth
d0ec532fa6 Add some more properties to the bp2build APEX converter (second try) am: 6e4950a061 am: 6de2c9b72b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1778212

Change-Id: Ic13b56e93a31357887d37c21952d5a2fe8d85d87
 2021-07-27 10:57:03 +00: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
Jiyong Park
c82bf7acf8 [automerger skipped] Add more *-ndk libraries to VndkMustUseVendorVariantList am: c07a16ca1a -s ours 
am skip reason: Merged-In I7c7aa1025a876e45fc4779378825d91098164e84 with SHA-1 5b48d9a01b is already in history

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

Change-Id: If53e541646c3c50aafe45e972d7b75be26b0c94f
 2021-07-27 09:59:41 +00: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
f55c2f7a3c [automerger skipped] Merge "Add more *-ndk libraries to VndkMustUseVendorVariantList" am: 2695e20d57 -s ours am: 86487af9f5 -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: I7339245b1614da5287f52f60bd2bd7e4aa43104a
 2021-07-27 04:48:45 +00: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
53b662e2f3 Merge "Revert "Add some more properties to the bp2build APEX converter."" am: d0e6ad1ab3 am: 8ed074029d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1778407

Change-Id: I732ad6808d71b32642fb5892387a6500c31af9d3
 2021-07-27 03:25:29 +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
Treehugger Robot
7746ae6a2e Merge changes I2b07c775,I4a562ccc am: ab8cdb0075 am: 5145dacc32 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1778589

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

Change-Id: I7274c07caeee96306b69172793a9c9699839b35b
 2021-07-27 03:02:43 +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
a0d8ab9de2 [automerger skipped] Merge changes from topic "remove_ndk_platform" am: 1b064ab3e7 am: 20ab109f68 -s ours 
am skip reason: Merged-In I7c7aa1025a876e45fc4779378825d91098164e84 with SHA-1 5b48d9a01b is already in history

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

Change-Id: Icdcafe8d411b9b847573e6caed7e9bac607ceccc
 2021-07-27 01:23:49 +00:00
Jiyong Park
80f5729283 [automerger skipped] Reland: Add more target-specific properties am: a592b6f8e0 am: fe9eee7747 -s ours 
am skip reason: Merged-In I126e272cd29eb1e03662c54bfa8bd64e704adc74 with SHA-1 9259a7ee61 is already in history

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

Change-Id: I1dfcf6e3f5e4f096cfb44fd093da59f4d0fe4ad2
 2021-07-27 01:23:46 +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
Treehugger Robot
d03af7939f Merge changes I19f0e104,I7994bee6 am: 2c405ff6ae am: 8846c8876f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1765127

Change-Id: I0c2dc4c2ea1d6e97dab9a1bc5584a259e5a6a7e6
 2021-07-27 01:17:40 +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
0bdc5ffa39 Merge "Load RBE related env vars from config files" am: b3a5d18470 am: a7ab7c9394 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1773209

Change-Id: Ib23aab4336b59ccecddb8a672360cefd1459ce1d
 2021-07-26 22:27:44 +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
ad6cb082a4 Merge "Rename UpdatableBootJars to ApexBootJars." am: 4102c0cc47 am: adb9e9f752 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1773912

Change-Id: Iecc5f48620b2d4e5390ab9a081b2193924bd0dda
 2021-07-26 18:29:56 +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
Mathew Inwood
3a0401ac77 [automerger skipped] Merge "Build updatable-bcp-packages.txt from prebuilts in sdk snapshot" into sc-dev am: e6cc66da0e -s ours 
am skip reason: Merged-In If0706e4551a331b48d383123088e63924dded48b with SHA-1 630b11e9d4 is already in history

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

Change-Id: I1c9b6370ce7f9158ce51153d44e7f1d2d80eace5
 2021-07-26 12:27:26 +00:00
Mathew Inwood
e6cc66da0e Merge "Build updatable-bcp-packages.txt from prebuilts in sdk snapshot" into sc-dev 2021-07-26 12:16:14 +00:00
Jingwen Chen
7651e9ae8a bp2build BUILD files for build/bazel/examples/apex. am: b643c7a085 am: ccce36b584 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1777787

Change-Id: I89d63e700cd68a230fcd5f20381afa0684938c8f
 2021-07-26 12:12:51 +00: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
Jiyong Park
021c24fcff Merge "Fix build" into sc-dev-plus-aosp 2021-07-26 05:38:40 +00:00
Jiyong Park
44a13ac401 *-ndk.so libraries are added to VndkMustUseVendorVariantList 
We will replace the ndk_platform backend with the ndk backend. The
former hasn't been deleted yet because there already are references to
it. When the existing references are all replaced with the ndk backend,
we will remove the ndk_platform backend and the corresponding libraries
will be removed from this list.

Bug: 161456198
Test: m

Merged-In: I7c7aa1025a876e45fc4779378825d91098164e84
Change-Id: I7c7aa1025a876e45fc4779378825d91098164e84
(cherry picked from commit b58719c156)
 2021-07-26 13:22:49 +09:00
Jiyong Park
b7e666f587 Fix build 
android.system.suspend-V1-ndk has added recently.

Bug: 194632673
Test: m
Change-Id: I003f8405e015df396d8c231046edb31c09ddc305
 2021-07-26 03:34:59 +00:00
Jiyong Park
a592b6f8e0 Reland: Add more target-specific properties 
Following properties are added:

* vendor.header_libs
* platform.cflags
* platform.header_libs
* platform.exclude_shared_libs

These are used in the *-ndk libraries generated from the aidl_interface
modules, so that we can build the platform variants of the libraries
just like the *-ndk_platform libraries. Eventually, we will remove the
*-ndk_platform libraries.

Bug: 161456198
Test: m
Merged-In: I126e272cd29eb1e03662c54bfa8bd64e704adc74
Change-Id: I126e272cd29eb1e03662c54bfa8bd64e704adc74
(cherry picked from commit bb14481408)
 2021-07-26 11:19:35 +09:00
TreeHugger Robot
5c4d5ca6cf Merge changes from topic "remove_ndk_platform" into sc-dev-plus-aosp 
* changes:
  *-ndk.so libraries are added to VndkMustUseVendorVariantList
  Reland: Add more target-specific properties
 2021-07-26 02:00:46 +00:00
Treehugger Robot
46afb55f63 Merge "Disable lint checks which do not apply in the platform" am: 04f3f07752 am: 918a5ba519 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1777154

Change-Id: I7251844f581917e54763b6bbdaa5d741a2bcb27c
 2021-07-24 16:42:33 +00:00