StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,427 Commits 1 Branch 0 Tags
6871bbf91ea92e86d82fcc2d56f2c8b89a06d670
Commit Graph

86427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peiyong Lin
6871bbf91e Properly define angle.mk 
Previously we used USE_ANGLE to determine whether the build should include
ANGLE drivers, this patch consolidates that into a separate Makefile.

Bug: b/270994705
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I4d7ffb869ced219009446d907230178e4b940157
Merged-In: I4d7ffb869ced219009446d907230178e4b940157
 2023-04-27 22:36:36 +00:00
Martijn Coenen
2467b20cec Merge "Add initial stopped state packages for AOSP products." into udc-dev 2023-04-27 16:35:34 +00:00
Yuxin Hu
7ea4231664 Merge "Use ro.gfx.angle.supported to indicate if ANGLE is built in vendor" into udc-dev 2023-04-27 15:36:27 +00:00
William Loh
f06227d7d2 Merge "Add preinstalled-packages-asl-files.xml to base_system.mk" into udc-dev 2023-04-27 01:11:36 +00:00
Yuxin Hu
9dfc376c19 Use ro.gfx.angle.supported to indicate if ANGLE is built in vendor 
This is a change cherry-picked from aosp:
https://r.android.com/2560175

Merged-In: I0fb881962ab77abd18f05d33393c4ee11694109c

Bug: b/270994705
Test: m -j45; flash and check Pixel 7 boots fine
atest CtsAngleIntegrationHostTestCases

Change-Id: I4632ff64bc26623c796b992a71761a754149955a
 2023-04-26 21:02:13 +00:00
Martijn Coenen
8a1cdb8e95 Add initial stopped state packages for AOSP products. 
AOSP starts with all apps exempt from the stopped state; apps without a
launcher entry aren't stopped by default, and all AOSP apps that do have
a launcher entry are contained in this sysconfig.

Bug: 269129704
Test: Manually inspect
Ignore-AOSP-First: Merge conflict from AOSP to internal master (and this needs to go to UDC, als)
Change-Id: I752f986a210621510f694b3f62bb5c6151db55d6
 2023-04-26 19:33:39 +00:00
William Loh
a3e0f4eed3 Add preinstalled-packages-asl-files.xml to base_system.mk 
Bug: 276979041
Test: None
Change-Id: I8165f2c33245ef5e652a9fb3dc93711f518dd079
 2023-04-26 10:50:49 -07:00
Alex Buynytskyy
44395a8138 Mark udc-dev as finalized branch. 
Ignore-AOSP-First: This CL is only meant internal udc-dev at this time.
Test: ./build-step-1-and-m.sh
Bug: 279615150
Change-Id: I9920da7605cf6861742607a62222287f0c79b003
 2023-04-26 06:00:24 +00:00
Pranav Gupta
33376577bf Remove MODULE_BUILD_FROM_SOURCE for gsi_release.mk 
The gsi_release.mk should be agnostic of AOSP or Android. In case of
Android builds, modules should be prebuilt, however in the case of AOSP
they can be built from source. This option should now be configured at
the product makefile level

Also update the shipping API to 34

Bug: 278607630

Test: TARGET_PRODUCT=gsi_arm64 TARGET_BUILD_VARIANT=userdebug build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
returns true
TARGET_PRODUCT=gsi_arm64 TARGET_BUILD_VARIANT=userdebug MODULE_BUILD_FROM_SOURCE=false build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
returns false
(cherry picked from https://android-review.googlesource.com/q/commit:105610bdf04b12404026e3b52f272688099eda93)
Merged-In: I5937764d8df307ed7547363e6ba2742828779282
Change-Id: I5937764d8df307ed7547363e6ba2742828779282
 2023-04-25 00:16:16 +00:00
Kelvin Zhang
3d2a5a168f Merge "Fix incremental OTA generation failures" into udc-dev 2023-04-24 19:51:19 +00:00
Kelvin Zhang
657af614c6 Fix incremental OTA generation failures 
source_file might be a directory, use the _ReadApexInfo() helper
function to read it instead of go straight to zipfiles.

Test: build incremental OTA for pixel
Bug: 279142680
Bug: 227848550
Bug: 277028723
(cherry picked from https://android-review.googlesource.com/q/commit:ca45d7a85d5eaf09ba8684f09440e8706ab190ca)
Merged-In: Ia0041e2c72c1a57123519c970f6e734194a81cd2
Change-Id: Ia0041e2c72c1a57123519c970f6e734194a81cd2
 2023-04-22 02:50:38 +00:00
Alex Buynytskyy
20466aa978 [RESTRICT AUTOMERGE] UpsideDownCake/34 is now REL 
Ignore-AOSP-First: UpsideDownCake Finalization
Bug: 275409981
Test: build
Change-Id: I4b5e9939b60cde7482021fc1d0aede38a99493c1
Merged-In: I4b5e9939b60cde7482021fc1d0aede38a99493c1
 2023-04-21 19:37:09 +00:00
Treehugger Robot
056ae79b51 Merge "Remove lunch target from appcompat log" am: e16241ce4f am: 80386ca945 am: 9b766fa41c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2542810

Change-Id: If4399fb590a4035627690c2302cf167013ef76fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 07:48:29 +00:00
Treehugger Robot
9b766fa41c Merge "Remove lunch target from appcompat log" am: e16241ce4f am: 80386ca945 
Original change: https://android-review.googlesource.com/c/platform/build/+/2542810

Change-Id: I8904a5088b72686ac52ae37fe735f283cf755c36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 07:06:13 +00:00
Treehugger Robot
80386ca945 Merge "Remove lunch target from appcompat log" am: e16241ce4f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2542810

Change-Id: Id1dbcb10e191d7a61f8fa70eae8f545ad7da23e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 06:27:18 +00:00
Treehugger Robot
e16241ce4f Merge "Remove lunch target from appcompat log" 2023-04-21 05:46:47 +00:00
Treehugger Robot
a774901872 Merge "Cleanup the list of Soong prebuilt module types." am: 269248add6 am: 6a2b03bae8 am: 6117ec0e8d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2548552

Change-Id: Ie83e38188c3521c5a733839e5bb782cc17455862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 03:36:05 +00:00
Treehugger Robot
6117ec0e8d Merge "Cleanup the list of Soong prebuilt module types." am: 269248add6 am: 6a2b03bae8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2548552

Change-Id: Iff7ebf5069833c03ae44e74bd7c67556a5d08f3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 02:54:45 +00:00
Treehugger Robot
6a2b03bae8 Merge "Cleanup the list of Soong prebuilt module types." am: 269248add6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2548552

Change-Id: I0f0fc464ca4b7243b53a36ea433bf17269888a39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 02:16:24 +00:00
Treehugger Robot
269248add6 Merge "Cleanup the list of Soong prebuilt module types." 2023-04-21 01:40:01 +00:00
Wei Li
6f407ba0a8 Cleanup the list of Soong prebuilt module types. 
Bug: 272356622
Test: CIs
Change-Id: I4031f0a73f5af1bbf1eb374bcd7d3a19b9609a46
 2023-04-20 14:13:58 -07:00
Vinh Tran
40db731ad4 Merge "Split PRODUCT_AFDO_PROFILES into two variables" into tm-qpr-dev-plus-aosp am: 42b7e605c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22603331

Change-Id: I02df3c23795d8a543a1cdff117cd29a40dd21e87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 19:54:03 +00:00
Vinh Tran
42b7e605c2 Merge "Split PRODUCT_AFDO_PROFILES into two variables" into tm-qpr-dev-plus-aosp 2023-04-20 19:20:19 +00:00
Treehugger Robot
c30753213c Merge "Allow ota_from_target_file to work entirely on directories" am: ece71703f8 am: 3de45a7b2b am: 4f600c2a34 
Original change: https://android-review.googlesource.com/c/platform/build/+/2542170

Change-Id: Id9d0a79469a15b3ff8149826ef523a155eacb840
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 17:26:53 +00:00
Treehugger Robot
4f600c2a34 Merge "Allow ota_from_target_file to work entirely on directories" am: ece71703f8 am: 3de45a7b2b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2542170

Change-Id: Ia718bce15427ad03c434f594b004429972623a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 16:28:01 +00:00
Treehugger Robot
3de45a7b2b Merge "Allow ota_from_target_file to work entirely on directories" am: ece71703f8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2542170

Change-Id: I6e20f9cd33d7b3e6ca6aa9a29a9f13c50b679fe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 15:51:12 +00:00
Bob Badour
adaddab362 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/make" am: 9e9336f285 am: f59aae96fa am: 5339380948 
Original change: https://android-review.googlesource.com/c/platform/build/+/2548370

Change-Id: I884b859011aca8dc2bbdd302160306f7122b550f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 15:47:11 +00:00
Treehugger Robot
ece71703f8 Merge "Allow ota_from_target_file to work entirely on directories" 2023-04-20 15:17:50 +00:00
Bob Badour
5339380948 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/make" am: 9e9336f285 am: f59aae96fa 
Original change: https://android-review.googlesource.com/c/platform/build/+/2548370

Change-Id: Ic45413e8722599cb96fdcf05761fc3d83914f1c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 15:05:41 +00:00
Bob Badour
f59aae96fa Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/make" am: 9e9336f285 
Original change: https://android-review.googlesource.com/c/platform/build/+/2548370

Change-Id: I6fe3e38d5ce39eb39df95ea993fe7eda47e81c37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 14:29:50 +00:00
Bob Badour
9e9336f285 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/make" 2023-04-20 13:35:27 +00:00
Treehugger Robot
5c2fd939b9 Merge "Add create_brick_ota to otatools.zip" am: 05cffb1b2a am: fa7573bf19 am: 9563d43a64 
Original change: https://android-review.googlesource.com/c/platform/build/+/2547515

Change-Id: I7c0d25bd561e7103c2fd123e5467079cadfdd10a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 11:51:26 +00:00
Treehugger Robot
9563d43a64 Merge "Add create_brick_ota to otatools.zip" am: 05cffb1b2a am: fa7573bf19 
Original change: https://android-review.googlesource.com/c/platform/build/+/2547515

Change-Id: I73d22b92ad840f432c099773992c760c963f4a8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 11:09:13 +00:00
Treehugger Robot
fa7573bf19 Merge "Add create_brick_ota to otatools.zip" am: 05cffb1b2a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2547515

Change-Id: I9c6c4ba7046c749b76edfc737be6f4ac423ff601
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 10:29:56 +00:00
Treehugger Robot
05cffb1b2a Merge "Add create_brick_ota to otatools.zip" 2023-04-20 09:49:59 +00:00
Roman Kiryanov
b645272f3c Merge "Cleanup in emulator_arm64/device.mk" am: aa1f970711 am: 40e233c6ba am: 8c82f8e5c1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2548555

Change-Id: I00ce7a8263d7e8e704acfbbceeed9efb1591cf6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 08:00:22 +00:00
Roman Kiryanov
8c82f8e5c1 Merge "Cleanup in emulator_arm64/device.mk" am: aa1f970711 am: 40e233c6ba 
Original change: https://android-review.googlesource.com/c/platform/build/+/2548555

Change-Id: I5835f177be5be2e139758c083d05df46872c66dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 07:17:54 +00:00
Roman Kiryanov
40e233c6ba Merge "Cleanup in emulator_arm64/device.mk" am: aa1f970711 
Original change: https://android-review.googlesource.com/c/platform/build/+/2548555

Change-Id: I57cd7c4dd7c82ffc05a2115b37a6653ccd261ac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 06:40:21 +00:00
Roman Kiryanov
aa1f970711 Merge "Cleanup in emulator_arm64/device.mk" 2023-04-20 05:59:27 +00:00
Kelvin Zhang
ca812338a2 Add create_brick_ota to otatools.zip 
This allows create_brick_ota binary to be used by downloading
otatools.zip from ab, instead of having to build it locally.

Bug: 278925744
Change-Id: I704355b74bc2de7e8d5b881deb01efbee0fdda2a
 2023-04-19 19:15:07 -07:00
Roman Kiryanov
b623cfbe96 Cleanup in emulator_arm64/device.mk 
emulator specifies its kernel in device/generic/goldfish

Bug: 111538404
Test: presubmit
Change-Id: I76ab7e5fbb19805f52c2ca4713e11cc544ada905
Signed-off-by: Roman Kiryanov <rkir@google.com>
 2023-04-19 13:30:46 -07:00
Wei Li
4f8f32b14f Merge "Copy SBOM files of unbundled APKs to dist directory." am: 0ab788ee83 am: 54854098e9 am: b3565b4aa4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2534800

Change-Id: I234246245c1c9d63a9c7758d9fab8196e8b8475e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 19:34:48 +00:00
Wei Li
b3565b4aa4 Merge "Copy SBOM files of unbundled APKs to dist directory." am: 0ab788ee83 am: 54854098e9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2534800

Change-Id: I73b004a77e8cfa8f39dd2f901103be21855dcd31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 18:21:26 +00:00
Wei Li
54854098e9 Merge "Copy SBOM files of unbundled APKs to dist directory." am: 0ab788ee83 
Original change: https://android-review.googlesource.com/c/platform/build/+/2534800

Change-Id: I80b17ef163898aa1f5d667fa35539ce99026169a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 17:32:50 +00:00
Bob Badour
ffba21bbae [LSC] Add LOCAL_LICENSE_KINDS to build/make 
Added SPDX-license-identifier-Apache-2.0 to:
  tools/sbom/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I1f8e5fd8e787a4c53bf4caf80a4000d46d0291e4
 2023-04-19 09:48:01 -07:00
Wei Li
0ab788ee83 Merge "Copy SBOM files of unbundled APKs to dist directory." 2023-04-19 16:36:36 +00:00
Vinh Tran
ebce49601a Split PRODUCT_AFDO_PROFILES into two variables 
Currently, PRODUCT_AFDO_PROFILES is generally applied to all products and is not semantically treated as a product config varilable.

Splitting this allows us:
1. Explicitly tell that PRODUCT_AFDO_PROFILES takes precedence over product-agnostic profiles in AFDO_PROFILES
2. Add PRODUCT_AFDO_PROFILES to _product_vars_list

Ignore-AOSP-First: ag/22604900 in the same topic is in internal repo
Test: Define PRODUCT_AFDO_PROFILES in a product config and make sure it appears first in the soong var AfdoProfiles
Bug: 277215393
Change-Id: I284f6308d456994bb72129cb0d7be7cd091993ae
 2023-04-19 15:54:13 +00:00
Colin Cross
64fae70977 Merge "Move old installed file cleanup logic below build/make/core/Makefile" am: 4cd2568acc am: b8dad832a7 am: d844885259 
Original change: https://android-review.googlesource.com/c/platform/build/+/2544890

Change-Id: I70c0736a9c50524e21c6e20c44e473210e2b0451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 05:12:30 +00:00
Colin Cross
d844885259 Merge "Move old installed file cleanup logic below build/make/core/Makefile" am: 4cd2568acc am: b8dad832a7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2544890

Change-Id: I61bc49e29f62e3b39dbb60f67bf6a882176b6274
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 04:23:50 +00:00
Colin Cross
b8dad832a7 Merge "Move old installed file cleanup logic below build/make/core/Makefile" am: 4cd2568acc 
Original change: https://android-review.googlesource.com/c/platform/build/+/2544890

Change-Id: Iea367fd221a07576cdbbfea86479961bb22fb11c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 03:38:46 +00:00