StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
75,798 Commits 1 Branch 0 Tags
dc40e465b47ddca6ac09946ffb2ff8ebdf3c9db7
Commit Graph

29493 Commits

Author SHA1 Message Date
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
liulvping
689c3fb5d7 Fix product single value variables failed issue 
Test: source & lunch & make

Signed-off-by: liulvping <liulvping@xiaomi.com>
Change-Id: Idd0e1c561504afb7c7fef4242b3b122cba220ed0
 2021-11-09 02:05:25 +00:00
Colin Cross
47cfffea79 Move java install rules into Soong 
Remove the copy rules for LOCAL_SOONG_BUILT_INSTALLED, they will already
be created by Soong.

Also clean the soong host tools directory to remove any old copies of
java binaries.

Bug: 204136549
Test: m checkbuild
Change-Id: Ib6b5362ad59aa48770e48541430d6857846926c2
 2021-11-08 15:23:32 -08:00
Colin Cross
a69b809425 Don't create compatibility suite copy rules for installed path 
Don't create compatibility suite copy rules for $(LOCAL_BUILT_MODULE)
to $(LOCAL_INSTALLED_MODULE), as that could conflict with a Soong
install rule.  Instead, always create the install rule the normal way,
and replace the compatibility suite copy rule with a noop if it is the
same as the normal rule.

Bug: 204136549
Test: m checkbuild
Change-Id: Ic8ac80eda8554fae2b7ecc2516165da020bdaebe
 2021-11-08 15:23:32 -08: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
6204ce58c4 Merge "Do not disable prebuilts for sdk builds" am: db7732900b am: e637223368 am: 14d40d1d31 am: a30862edcf 
Original change: https://android-review.googlesource.com/c/platform/build/+/1881856

Change-Id: I684c9a35ca7c1d260546c9ec1572fa3eb9a68827
 2021-11-08 11:41:47 +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
Michael Wright
f67a456828 S V2 is now 32 am: 24d3b88704 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16140164

Change-Id: Ic8bf8f30a82bebdd9c8e60a347fb8502184cfc61
 2021-11-06 16:06:50 +00:00
Cole Faust
be98cc51e5 Merge "Make starlark board configuration work with sdk_phone_x86_64" am: 2f1bd70c9c am: 8df9e5c1c2 am: 286c0c11b3 am: 639aa227b9 
Original change: https://android-review.googlesource.com/c/platform/build/+/1849978

Change-Id: I121ba436f746ffa21bde2602de4aa10bebf278cc
 2021-11-05 20:11:47 +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
Michael Wright
24d3b88704 S V2 is now 32 
Bug: 204295952
Test: N/A
Change-Id: I0627247e0b40c6c912584d55417671d20167b7c2
Merged-In: I0627247e0b40c6c912584d55417671d20167b7c2
 2021-11-05 19:39:39 +00:00
Cole Faust
c2becd087a Disallow setting LOCAL_MODULE_STEM for android packages 
LOCAL_MODULE_STEM is not used in the packaging code,
except when setting PACKAGES.$(LOCAL_MODULE).STEM.
Having this disconnect between PACKAGES.$(LOCAL_MODULE).STEM
and the actual name of the apk causes an apk signing
step to fail.

Other module types like BUILD_HEADER_LIBRARY explicetly
disallow setting LOCAL_MODULE_STEM, so we can also just
do that for packages.

Fixes: 204027319
Test: Presubmits
Change-Id: Ib3da9a8dd6792a6c9d725cb24b835b32dbb13c40
 2021-11-05 12:35:18 -07: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
75abdf43b8 Merge "Move tools compiled by Soong to HOST_OUT_EXECUTABLES" am: 11b78c16ad am: bef85826cb am: 20c2c23b61 am: 3f57f9b5ea 
Original change: https://android-review.googlesource.com/c/platform/build/+/1869446

Change-Id: I47cefb20758d7203dfc4b6eec455afc31450132d
 2021-11-05 18:22:56 +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
Android Build Coastguard Worker
32ce1a4113 Version bump to SQ1A.211205.008 [core/build_id.mk] 
Change-Id: I701608290fb184cabcc82c26a7fe841f514d5b4b
 2021-11-05 17:31:39 +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
1aa3e42c3f Merge "vintf recovery install parity w/ init_rc" am: ec71cbf0c8 am: b77d3c2e9b am: ad2d80bb18 am: 7e7a702bb3 
Original change: https://android-review.googlesource.com/c/platform/build/+/1877977

Change-Id: Idf510ab485301c6621594304110eaaa9b67c9a1c
 2021-11-04 23:46:45 +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
d1a921ec8b Merge changes from topic "tproto" am: cd128891ed am: 0f0e4d23e5 am: 40bd79e8b7 am: aa3348dd1b 
Original change: https://android-review.googlesource.com/c/platform/build/+/1865920

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

Change-Id: I28768283798ca4b3fb037c1e909f00f5eb625bfc
 2021-11-03 19:49:39 +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
Android Build Coastguard Worker
365249c0d5 Version bump to SQ1A.211205.007 [core/build_id.mk] 
Change-Id: Ib967214e43a8a6a665a77b246760fa7e5e8bf717
 2021-11-02 18:19:17 +00:00
Treehugger Robot
2ee5168b84 Merge "Add share_libs and system_share_libs to module-info" am: dcb0e44c46 am: 943fd2fa7f am: 90c0ddac24 am: cc893addc5 
Original change: https://android-review.googlesource.com/c/platform/build/+/1855994

Change-Id: If70ace8f20009b06a8edf7f93855b222096e50f6
 2021-11-02 03:02:00 +00: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
772ef767d7 Merge "Support generating install rules in Soong" am: 3a79e5b459 am: a7676b29ef am: 6c59dc79fe am: 0d73915f33 
Original change: https://android-review.googlesource.com/c/platform/build/+/1869445

Change-Id: I4a6b88a7d3a45236622ba6a07263ca2542b73a63
 2021-11-01 22:46:11 +00: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