StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
73,080 Commits 1 Branch 0 Tags
16b4beb6448b6a104bc53b8c31aa08e67bc5ef0c
Commit Graph

28548 Commits

Author SHA1 Message Date
Treehugger Robot
25a7176c8e Merge "Add missing dependency from module name to symlinks" am: a421192568 am: dcb9d51f9d am: be4ee8430d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1883262

Change-Id: I50635f6c75475763be2b5655d49f618e4383b39c
 2021-11-09 12:23:10 +00:00
Treehugger Robot
be4ee8430d Merge "Add missing dependency from module name to symlinks" am: a421192568 am: dcb9d51f9d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1883262

Change-Id: Ifd61199a54b90f16664206c15f626ad1157e31cc
 2021-11-09 12:02:14 +00:00
Colin Cross
d954ea888a Add missing dependency from module name to symlinks 
The rules to install the symlinks had dependencies from PRODUCT_PACKAGES
install rules, but from manual install requests like `m toybox`.  Add
the missing dependencies.  Also add the new declare-0p-target licensing
call.

Fixes: 205524422
Test: m toybox
Change-Id: Ie9a5e37b09250aa271ab153a13f41bc34fa4a38a
 2021-11-08 19:40:22 +00:00
Anton Hansson
a30862edcf Merge "Do not disable prebuilts for sdk builds" am: db7732900b am: e637223368 am: 14d40d1d31 
Original change: https://android-review.googlesource.com/c/platform/build/+/1881856

Change-Id: If94283e72318b9c0c4c7f6a9b6b461deb92b8d13
 2021-11-08 11:23:54 +00:00
Anton Hansson
14d40d1d31 Merge "Do not disable prebuilts for sdk builds" am: db7732900b am: e637223368 
Original change: https://android-review.googlesource.com/c/platform/build/+/1881856

Change-Id: I5a6c9c22f4a6a78aff336e18caf7c8f6cca22351
 2021-11-08 11:05:26 +00:00
Anton Hansson
db7732900b Merge "Do not disable prebuilts for sdk builds" 2021-11-08 10:27:22 +00:00
Cole Faust
639aa227b9 Merge "Make starlark board configuration work with sdk_phone_x86_64" am: 2f1bd70c9c am: 8df9e5c1c2 am: 286c0c11b3 
Original change: https://android-review.googlesource.com/c/platform/build/+/1849978

Change-Id: Ica9b63e2ecfa180d15882954bc47c0e6bc4a38d2
 2021-11-05 19:47:34 +00:00
Cole Faust
286c0c11b3 Merge "Make starlark board configuration work with sdk_phone_x86_64" am: 2f1bd70c9c am: 8df9e5c1c2 
Original change: https://android-review.googlesource.com/c/platform/build/+/1849978

Change-Id: I31e6925676dbb984f031f8f9478aecb68cc61619
 2021-11-05 19:28:54 +00:00
Cole Faust
2f1bd70c9c Merge "Make starlark board configuration work with sdk_phone_x86_64" 2021-11-05 18:42:12 +00:00
Colin Cross
3f57f9b5ea Merge "Move tools compiled by Soong to HOST_OUT_EXECUTABLES" am: 11b78c16ad am: bef85826cb am: 20c2c23b61 
Original change: https://android-review.googlesource.com/c/platform/build/+/1869446

Change-Id: I5f91161d2964c8daf1fff2c16316060ea373c63a
 2021-11-05 18:10:10 +00:00
Colin Cross
20c2c23b61 Merge "Move tools compiled by Soong to HOST_OUT_EXECUTABLES" am: 11b78c16ad am: bef85826cb 
Original change: https://android-review.googlesource.com/c/platform/build/+/1869446

Change-Id: Iaf86525b59853695ad14c6f6a4effa60bed376fd
 2021-11-05 17:53:50 +00:00
Colin Cross
11b78c16ad Merge "Move tools compiled by Soong to HOST_OUT_EXECUTABLES" 2021-11-05 17:14:59 +00:00
Anton Hansson
30ae089556 Do not disable prebuilts for sdk builds 
The artifacts in the SDK zip should be OK to build with a prebuilt
stubs enabled, even if prebuilt apexes are not, because the system
images in the SDK stub are not currently used.

Bug: 205008975
Bug: 204407658
Test: m sdk
Change-Id: Ia78cf87743ff394dcfaa1b43556b230c0dda8742
 2021-11-05 16:34:27 +00:00
Steven Moreland
7e7a702bb3 Merge "vintf recovery install parity w/ init_rc" am: ec71cbf0c8 am: b77d3c2e9b am: ad2d80bb18 
Original change: https://android-review.googlesource.com/c/platform/build/+/1877977

Change-Id: Ie7d6946ada77881f8004cad9db090fa8ff5df02e
 2021-11-04 23:27:26 +00:00
Cole Faust
985fa48a98 Make starlark board configuration work with sdk_phone_x86_64 
The main issue with board configuration up till this
cl was that it didn't have access to the product configuration
variables. Pass those in by dumping the make variables to a
temporary file, which is then converted to RBC, loaded,
and passed to the starlark board config..

Bug: 201700692
Test: build/bazel/ci/rbc_product_config.sh -pb sdk_phone_x86_64-userdebug
Change-Id: I9a4946b970ca43c5b5f53a6c507ad2c1a2eca61e
 2021-11-04 16:13:24 -07:00
Steven Moreland
ad2d80bb18 Merge "vintf recovery install parity w/ init_rc" am: ec71cbf0c8 am: b77d3c2e9b 
Original change: https://android-review.googlesource.com/c/platform/build/+/1877977

Change-Id: I318b4cfd5d11f6240b00b05ca335073aa4ee9b5e
 2021-11-04 23:05:09 +00:00
Steven Moreland
ec71cbf0c8 Merge "vintf recovery install parity w/ init_rc" 2021-11-04 22:28:51 +00:00
Treehugger Robot
aa3348dd1b Merge changes from topic "tproto" am: cd128891ed am: 0f0e4d23e5 am: 40bd79e8b7 
Original change: https://android-review.googlesource.com/c/platform/build/+/1865920

Change-Id: I9d61f48ec35fc98d25ed76f7d9bdd1b67927c199
 2021-11-03 19:32:39 +00:00
Bob Badour
e6d1b1d160 Add macros for non-module license metadata and deps am: 879cfa867d am: 1efd13a2a1 am: c1d98c6310 
Original change: https://android-review.googlesource.com/c/platform/build/+/1741493

Change-Id: Ib209475f54d957ac3b8979c3fba53008e3f09d48
 2021-11-03 19:32:38 +00:00
Treehugger Robot
40bd79e8b7 Merge changes from topic "tproto" am: cd128891ed am: 0f0e4d23e5 
Original change: https://android-review.googlesource.com/c/platform/build/+/1865920

Change-Id: Ic84a675143f1aa3cd68251ff0ef1d58cca7fcf4f
 2021-11-03 19:13:50 +00:00
Bob Badour
c1d98c6310 Add macros for non-module license metadata and deps am: 879cfa867d am: 1efd13a2a1 
Original change: https://android-review.googlesource.com/c/platform/build/+/1741493

Change-Id: I9bf667d790b1e525fe27780bb0654542423a7da1
 2021-11-03 19:13:49 +00:00
Bob Badour
1efd13a2a1 Add macros for non-module license metadata and deps am: 879cfa867d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1741493

Change-Id: I7a268d6542ef1be0dd1cd5182a1d7e0b5ac3d32e
 2021-11-03 18:47:10 +00:00
Treehugger Robot
cd128891ed Merge changes from topic "tproto" 
* changes:
  Convert .meta_lic files to textproto
  Add macros for non-module license metadata and deps
 2021-11-03 18:31:02 +00:00
Colin Cross
1ee26cae73 Convert .meta_lic files to textproto 
Make it easier to write tools against .meta_lic files and store complex
data by writing them in textproto.

Test: builds
Change-Id: Ibbb6cfbb1bdddd3d938a86d563673a049d826d66
 2021-11-03 15:44:00 +00:00
Bill Yi
468572bad8 Merge SP1A.211105.004 to aosp-master - DO NOT MERGE 
Merged-In: I68a7e42b3bd2b27e0c9ff8480f71af7aaf9dcb46
Merged-In: Ia18162968822dfbee5299c2692aef1e3c75ba843
Change-Id: I2b422d3dffe04be00304663294b48052a9a29aca
 2021-11-03 12:17:35 +00:00
Bob Badour
879cfa867d Add macros for non-module license metadata and deps 
Gets rid of .meta_module files and instead defers emitting rules until
after all the non-module targets have been processed. Allows direct
dependency on .meta_lic files, which in turn depend on license text
files.

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Test: m systemlicense
Test: m reportmissinglicenses

Change-Id: I2c467feac6e13a9366ff66f924889f1dbd48c3f1
 2021-11-03 00:52:25 +00:00
The Android Open Source Project
b75d7e6f40 Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE 
Merged-In: Ia18162968822dfbee5299c2692aef1e3c75ba843
Change-Id: I8542ab4e0b080efd7552ab7db0dde4c7cef10d5b
 2021-11-02 14:23:03 -07:00
Treehugger Robot
cc893addc5 Merge "Add share_libs and system_share_libs to module-info" am: dcb0e44c46 am: 943fd2fa7f am: 90c0ddac24 
Original change: https://android-review.googlesource.com/c/platform/build/+/1855994

Change-Id: Id7901f4dedaf9e04cfed2820aa7cf18a360c1649
 2021-11-02 02:44:10 +00:00
Treehugger Robot
90c0ddac24 Merge "Add share_libs and system_share_libs to module-info" am: dcb0e44c46 am: 943fd2fa7f 
Original change: https://android-review.googlesource.com/c/platform/build/+/1855994

Change-Id: Ia18162968822dfbee5299c2692aef1e3c75ba843
 2021-11-02 02:28:36 +00:00
Treehugger Robot
dcb0e44c46 Merge "Add share_libs and system_share_libs to module-info" 2021-11-02 01:52:17 +00:00
Steven Moreland
b186183ae2 vintf recovery install parity w/ init_rc 
There was a relatively recent change (id
I82d0f40d6d7047e271612204391c5a027f84f52f) which avoided installing
init_rc scripts to system when a module was installed to system. This
same bug also existed in VINTF installs.

Future consideration: macrotize behavior (delaying since there are some
subtle differences in paths/variables and given bazel efforts).

Fixes: 204270700
Test: boot
Test: 'mmma hardware/interfaces/health/aidl/default' installs vintf
fragments to '/system/etc/vintf/manifest' before this change but not
after.

Change-Id: Icf505af74c95386a0ed8cb4468dcf7c1122db847
 2021-11-01 17:58:28 -07:00
Colin Cross
0d73915f33 Merge "Support generating install rules in Soong" am: 3a79e5b459 am: a7676b29ef am: 6c59dc79fe 
Original change: https://android-review.googlesource.com/c/platform/build/+/1869445

Change-Id: I05a3202edcfdafcb7f089faf0530c052ea9935d7
 2021-11-01 22:23:07 +00:00
Colin Cross
6c59dc79fe Merge "Support generating install rules in Soong" am: 3a79e5b459 am: a7676b29ef 
Original change: https://android-review.googlesource.com/c/platform/build/+/1869445

Change-Id: I3685f15891449a2af5a24168f4b7b967e1da1782
 2021-11-01 22:05:02 +00:00
Colin Cross
bca6483b07 Move tools compiled by Soong to HOST_OUT_EXECUTABLES 
Soong now installs native tools to HOST_OUT_EXECUTABLES instead
of SOONG_HOST_OUT_EXECUTABLES.

Also add a cleanspec for SOONG_HOST_OUT to remove old files from
SOONG_HOST_OUT_EXECUTABLES.

Bug: 204136549
Test: m checkbuild
Change-Id: Id18213b9294b6d2cf78f657740c6d5a02733b8ad
 2021-11-01 15:03:01 -07:00
Colin Cross
3a79e5b459 Merge "Support generating install rules in Soong" 2021-11-01 21:31:56 +00:00
Ulyana Trafimovich
dfb7c60023 Merge "Deprecate system server jars defined in Android.mk." am: 75342c1932 am: b563ae2537 am: e735b841e1 
Original change: https://android-review.googlesource.com/c/platform/build/+/1869193

Change-Id: I02651b5a113a109347512305b1da15aafcea1022
 2021-11-01 10:43:11 +00:00
Ulyana Trafimovich
e735b841e1 Merge "Deprecate system server jars defined in Android.mk." am: 75342c1932 am: b563ae2537 
Original change: https://android-review.googlesource.com/c/platform/build/+/1869193

Change-Id: Idab69065e3128bc13e518adbdb5a9d78ebf79854
 2021-11-01 10:31:31 +00:00
Ulyana Trafimovich
75342c1932 Merge "Deprecate system server jars defined in Android.mk." 2021-11-01 10:01:10 +00:00
yangbill
5f5e2362fa Add share_libs and system_share_libs to module-info 
Bug: 202922558
Bug: 204269866
Test: m out/target/product/vsoc_x86_64/module-info.json

Change-Id: Idb4e66216cac4835968454f83196107f6bec4c1c
 2021-11-01 06:38:43 +00:00
Treehugger Robot
690f6364e4 Merge "Support custom APEX signing tool" am: 76a4c62f56 am: c24e277d03 am: 4cb46d6fc8 
Original change: https://android-review.googlesource.com/c/platform/build/+/1870245

Change-Id: I7bd99e12e57af0d588e73c75c8d83c9215412a99
 2021-10-30 00:30:32 +00:00
Treehugger Robot
4cb46d6fc8 Merge "Support custom APEX signing tool" am: 76a4c62f56 am: c24e277d03 
Original change: https://android-review.googlesource.com/c/platform/build/+/1870245

Change-Id: I23891186e5413f7db813fab0b3dfde32e9a60e91
 2021-10-30 00:13:05 +00:00
Treehugger Robot
76a4c62f56 Merge "Support custom APEX signing tool" 2021-10-29 23:39:26 +00:00
Colin Cross
23ee375a4a Support generating install rules in Soong 
Support moving some install rules into Soong by allowing Soong to
provide a Makefile containing install rules, and by skipping parts
of base_rules.mk when Soong already created an install rule.

The install rules are exported as a Makefile instead of directly
in Soong's build.ninja file so that base_rules.mk can add dependencies
from the `required` property that are hard to resolve in Soong.

Bug: 204136549
Test: m checkbuild
Change-Id: Ife2964d76469b385e90c0c5f6adf21bd2b5e8bf6
 2021-10-29 15:43:39 -07:00
Jiakai Zhang
6cc0fb496f Merge "Add a build-time check for dexpreopting system server jars." am: 3f35c93578 am: 7e6337ae80 am: 77734c2139 
Original change: https://android-review.googlesource.com/c/platform/build/+/1853593

Change-Id: I9b74436aefb43c1e24dfd87ab0bfa12d567f899d
 2021-10-29 19:01:12 +00:00
Jiakai Zhang
77734c2139 Merge "Add a build-time check for dexpreopting system server jars." am: 3f35c93578 am: 7e6337ae80 
Original change: https://android-review.googlesource.com/c/platform/build/+/1853593

Change-Id: I291206db9bf455f3895dcf4ed34401cf42be1d72
 2021-10-29 18:43:00 +00:00
Jiakai Zhang
3f35c93578 Merge "Add a build-time check for dexpreopting system server jars." 2021-10-29 18:00:51 +00:00
Jiakai Zhang
b6931f2f5b Add a build-time check for dexpreopting system server jars. 
Bug: 201371822
Test: m nothing
Test: manual -
  1. Add "service-permission" to DEXPREOPT_DISABLED_MODULES (https://cs.android.com/android/platform/superproject/+/master:build/make/core/product_config.mk?q=DEXPREOPT_DISABLED_MODULES)
  2. m nothing
  3. See the error:
    Missing compilation artifacts. Dexpreopting is not working for some system server jars
    Offending entries:
    system/framework/oat/x86_64/apex@com.android.permission@javalib@service-permission.jar@classes.odex
    system/framework/oat/x86_64/apex@com.android.permission@javalib@service-permission.jar@classes.vdex

Change-Id: If29b1c367e22e302f76bfbae29588e69536414b7
 2021-10-29 11:56:49 +00:00
Treehugger Robot
1337bf9a18 Merge "Use findstring to check MODULE_BUILD_FROM_SOURCE" am: bf406bc182 am: 2191f99b61 am: cd090c2a18 
Original change: https://android-review.googlesource.com/c/platform/build/+/1870248

Change-Id: I3e27dc9345622442d9a470ff10363ecff8fb5c76
 2021-10-29 11:06:11 +00:00
Treehugger Robot
cd090c2a18 Merge "Use findstring to check MODULE_BUILD_FROM_SOURCE" am: bf406bc182 am: 2191f99b61 
Original change: https://android-review.googlesource.com/c/platform/build/+/1870248

Change-Id: Iee94290d6d959f8910bafc9a3925a19484d035f1
 2021-10-29 10:49:09 +00:00
Treehugger Robot
bf406bc182 Merge "Use findstring to check MODULE_BUILD_FROM_SOURCE" 2021-10-29 10:18:07 +00:00