StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,050 Commits 1 Branch 0 Tags
b83c3c55ff55fa8539bc3d0cdfc255d94296da9c
Commit Graph

34524 Commits

Author SHA1 Message Date
Jiakai Zhang
ba795042a6 Merge "Move CLC construction to Ninja phase." am: d5d51e21bf am: 8c2c816a8a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2595208

Change-Id: I5b36a475c0e6b2f37988359a4eb1455224587f8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 16:21:15 +00:00
Jiakai Zhang
8c2c816a8a Merge "Move CLC construction to Ninja phase." am: d5d51e21bf 
Original change: https://android-review.googlesource.com/c/platform/build/+/2595208

Change-Id: I5db0541400045de4a6f4e56a5771fa69498021b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 15:42:08 +00:00
Jiakai Zhang
d5d51e21bf Merge "Move CLC construction to Ninja phase." 2023-05-30 14:58:15 +00:00
Kiyoung Kim
d1ccbf1134 Merge "Rename soong.variable with target product" am: 6a821158b1 am: 96febf79e6 am: bdc8e89daa 
Original change: https://android-review.googlesource.com/c/platform/build/+/2556453

Change-Id: I284b3dca8b6e47db5c7e3d893e761268530e5427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 09:21:27 +00:00
Kiyoung Kim
bdc8e89daa Merge "Rename soong.variable with target product" am: 6a821158b1 am: 96febf79e6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2556453

Change-Id: I9b0383bd44912aafc52b917ed25c0f9ca229fc43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 08:33:18 +00:00
Kiyoung Kim
96febf79e6 Merge "Rename soong.variable with target product" am: 6a821158b1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2556453

Change-Id: I2ebab3ef3582650064ea40d70275ce5393f63674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 07:48:35 +00:00
Kiyoung Kim
6a821158b1 Merge "Rename soong.variable with target product" 2023-05-30 07:17:08 +00:00
Justin Yun
cff95e27ff Copy built images to generate target_files.zip 
Instead of building the images again, copy already built image files
to generate the target_files.zip.
It uses map_file_generator to generate the block list from the image
files.

Bug: 281960439
Test: m dist
Change-Id: I83284cf78affef882dad3b56f947e5ebc41a75e9
 2023-05-30 09:33:51 +09:00
Android Build Coastguard Worker
d977883c39 Make change and version bump to TQ3A.230705.001 
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23227854'] into tm-qpr3-release.

Change-Id: I71cb0ad613c743a809d31d389cc4f38fef0ca55f
 2023-05-27 17:14:48 +00:00
Steve Berbary
fecfd0e585 Update Security String to 2023-07-05 
Bug: 282371465
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d6c119bfaa2b768070bda5e0d9c71806d83b7e39)
Merged-In: I2bb1848e16aff436787a5bf43dbea18012d485a7
Change-Id: I2bb1848e16aff436787a5bf43dbea18012d485a7
 2023-05-27 17:11:57 +00:00
Dan Shi
1e4d747628 Support test runnner option in auto generated test configs 
Bug: 284179405
Bug: 236980335
Test: unittest
Change-Id: I7f96a2a2bc52316888e87af7e4bcc4ef50863716
 2023-05-26 21:35:10 +00:00
Android Build Coastguard Worker
ca8fe47fab Version bump to TQ3A.230605.012 [core/build_id.mk] 
Change-Id: Ie750c185483bcd4a9ed47d10793e698ef8201cfc
 2023-05-25 19:20:02 +00:00
Spandan Das
89fe4dd6f0 Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" am: 90673eb224 am: 3639919c3b am: 6c7fad39da 
Original change: https://android-review.googlesource.com/c/platform/build/+/2601327

Change-Id: I58412f3acf7d19fc211b30734a907bc7636e56f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 19:03:02 +00:00
Spandan Das
6c7fad39da Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" am: 90673eb224 am: 3639919c3b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2601327

Change-Id: I9bf82a97d32e4e018e11b7e3ae6e1e9f96230166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 18:18:44 +00:00
Spandan Das
3639919c3b Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" am: 90673eb224 
Original change: https://android-review.googlesource.com/c/platform/build/+/2601327

Change-Id: I46fa139988d8170231cca15c8421248a1efc480c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 17:34:34 +00:00
Spandan Das
593b2e5ce4 Create default PRODUCT_INCLUDE_TAGS in product_config 
In the current setup in partner branch, we
1. Add blueprint_package_includes to prebuilts/module_sdk/*
2. Add the correct PRODUCT_INCLUDE_TAGS to partner_modules

This means in those setups,none of the prebuilts are visible to aosp products since
they they do not inherit partner_module makefiles.
```
e.g.
prebuilts/module_sdk/art/current/Android.bp
prebuilts/module_sdk/art/<go_specific>/current/Android.bp

// aosp_arm cannot find either

```

To solve this, this CL creates a default inclusion tag for all products
that do not set any PRODUCT_INCLUDE_TAGS explicitly.
In the previous example, Soong analysis of aosp_* will use
prebuilts/module_sdk/art/current/Android.bp. This should be a no-op for
aosp and internal branches since none of the Android.bp files today contains
blueprint_package_includes

Test: m nothing for aosp_arm in the test branch of b/278604467#comment20
Test: m nothing for partner product that uses big android sdk
Test: m nothing for partner product that uses go sdk

Bug: 278604467
(cherry picked from https://android-review.googlesource.com/q/commit:2e69ea622877e7f88b82db4adbc284b9342f8c2c)
Merged-In: I322b52c34ed339989207609dd0fd23c27ed1f697
Change-Id: I322b52c34ed339989207609dd0fd23c27ed1f697
cp required as per b/278604467#comment25
 2023-05-25 16:50:39 +00:00
Spandan Das
90673eb224 Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" 2023-05-25 16:46:42 +00:00
Treehugger Robot
f0b33778d1 Merge "Add a copy of AB OTA partition list prop in vendor partition" am: 6f74957c19 am: b7bf0eb30b am: 8530c7f582 
Original change: https://android-review.googlesource.com/c/platform/build/+/2595649

Change-Id: I013e166cb03ef927a5af08fb6969301d0d69850b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 13:06:22 +00:00
Treehugger Robot
8530c7f582 Merge "Add a copy of AB OTA partition list prop in vendor partition" am: 6f74957c19 am: b7bf0eb30b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2595649

Change-Id: I1e4bf81cc64a0876a4f8a7e0c022a62233a9e744
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 12:21:06 +00:00
Treehugger Robot
b7bf0eb30b Merge "Add a copy of AB OTA partition list prop in vendor partition" am: 6f74957c19 
Original change: https://android-review.googlesource.com/c/platform/build/+/2595649

Change-Id: Ia7bf4f85f58b628bc94b37610fca072bfc44d302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 11:38:09 +00:00
Treehugger Robot
6f74957c19 Merge "Add a copy of AB OTA partition list prop in vendor partition" 2023-05-25 11:14:40 +00:00
Treehugger Robot
173bfad7c9 Merge "Support dynamic 64-bit drmserver" am: 95ad4d4ba0 am: 6c716889f9 am: 979255934c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2588496

Change-Id: Ic7cde71f181a5b437d77e28e07147fd73978dc3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 03:50:01 +00:00
Treehugger Robot
979255934c Merge "Support dynamic 64-bit drmserver" am: 95ad4d4ba0 am: 6c716889f9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2588496

Change-Id: Ia815c1f9b220848a96ce25b735dde5b1ccc80293
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 03:05:16 +00:00
Treehugger Robot
6c716889f9 Merge "Support dynamic 64-bit drmserver" am: 95ad4d4ba0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2588496

Change-Id: I05f061809b34064602aaec04e3403890f8b7c739
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 02:46:47 +00:00
Treehugger Robot
95ad4d4ba0 Merge "Support dynamic 64-bit drmserver" 2023-05-25 02:22:45 +00:00
Kelvin Zhang
ef158a9a51 Add a copy of AB OTA partition list prop in vendor partition 
The sysprop to enable/disable AB OTA update is in vendor partition,
but the sysprop which stores list of AB partitions is in product(which
is on system side of treble boundary). This is inconsistent and might
cause problems during mixed build. To mitigate, add a copy of AB
partition list prop in vendor, and readers of this prop will prefer the
vendor copy instead.

Bug: 283042235
Test: th
Change-Id: Idd73971817f663b08824e285d840ed8d8dd60d2c
 2023-05-24 18:26:27 -07:00
Vinh Tran
ae816fa64f Merge "Support sandboxing genrule" am: 2c5fb95f32 am: 4f86347cdd am: 9dee8b31b3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2585206

Change-Id: I00e04c04ae900b9e31bd9f5f18ad37c166eb9a8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 23:13:28 +00:00
Vinh Tran
9dee8b31b3 Merge "Support sandboxing genrule" am: 2c5fb95f32 am: 4f86347cdd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2585206

Change-Id: Ib3a49f4d1e7ccb7d5459a688e0b0eef6fea4da76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 22:08:05 +00:00
Vinh Tran
4f86347cdd Merge "Support sandboxing genrule" am: 2c5fb95f32 
Original change: https://android-review.googlesource.com/c/platform/build/+/2585206

Change-Id: Iafc5c069b70153ee24b721c8bf4c806c0bbbbc51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 21:47:27 +00:00
Vinh Tran
2c5fb95f32 Merge "Support sandboxing genrule" 2023-05-23 21:29:27 +00:00
Spandan Das
2e69ea6228 Create default PRODUCT_INCLUDE_TAGS in product_config 
In the current setup in partner branch, we
1. Add blueprint_package_includes to prebuilts/module_sdk/*
2. Add the correct PRODUCT_INCLUDE_TAGS to partner_modules

This means in those setups,none of the prebuilts are visible to aosp products since
they they do not inherit partner_module makefiles.
```
e.g.
prebuilts/module_sdk/art/current/Android.bp
prebuilts/module_sdk/art/<go_specific>/current/Android.bp

// aosp_arm cannot find either

```

To solve this, this CL creates a default inclusion tag for all products
that do not set any PRODUCT_INCLUDE_TAGS explicitly.
In the previous example, Soong analysis of aosp_* will use
prebuilts/module_sdk/art/current/Android.bp. This should be a no-op for
aosp and internal branches since none of the Android.bp files today contains
blueprint_package_includes

Test: m nothing for aosp_arm in the test branch of b/278604467#comment20
Test: m nothing for partner product that uses big android sdk
Test: m nothing for partner product that uses go sdk

Bug: 278604467
Change-Id: I322b52c34ed339989207609dd0fd23c27ed1f697
 2023-05-23 20:01:39 +00:00
Treehugger Robot
43201c9e99 Merge "Add BUILD_BROKEN_PLUGIN_VALIDATION flag" am: 2014bbb8e7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2595975

Change-Id: I326eafff5ddf8197c9f4dc9906aafdaecd93d1b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 17:13:29 +00:00
Treehugger Robot
2014bbb8e7 Merge "Add BUILD_BROKEN_PLUGIN_VALIDATION flag" 2023-05-23 17:08:46 +00:00
Treehugger Robot
346fd2c62e Merge "Fix build error about jar manifest" am: 27efd6e1eb am: 231a7e7741 am: c3ec285605 
Original change: https://android-review.googlesource.com/c/platform/build/+/2599886

Change-Id: I68307bc290786a70781be56111f717b81d5889e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 14:44:43 +00:00
Treehugger Robot
c3ec285605 Merge "Fix build error about jar manifest" am: 27efd6e1eb am: 231a7e7741 
Original change: https://android-review.googlesource.com/c/platform/build/+/2599886

Change-Id: Ib152f2e71b9387de6b89d8460bc629cd0e2b497f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 13:59:01 +00:00
Treehugger Robot
231a7e7741 Merge "Fix build error about jar manifest" am: 27efd6e1eb 
Original change: https://android-review.googlesource.com/c/platform/build/+/2599886

Change-Id: Icce798dca20864e8901121de8f5c07162b0c3703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 13:19:03 +00:00
Treehugger Robot
27efd6e1eb Merge "Fix build error about jar manifest" 2023-05-23 12:44:10 +00:00
Treehugger Robot
d4998848c4 Merge changes from topic "b/278060169" am: 2231df8a54 am: 5ad4cff1cb am: 892825189a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2599485

Change-Id: I2f511f1a6a437ff7783c885818f98635d23d03ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 10:50:31 +00:00
Treehugger Robot
892825189a Merge changes from topic "b/278060169" am: 2231df8a54 am: 5ad4cff1cb 
Original change: https://android-review.googlesource.com/c/platform/build/+/2599485

Change-Id: Ic9f1572f61adc84f694ad131314892d2b7236bc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 10:05:31 +00:00
Treehugger Robot
5ad4cff1cb Merge changes from topic "b/278060169" am: 2231df8a54 
Original change: https://android-review.googlesource.com/c/platform/build/+/2599485

Change-Id: I6099574659b1880f4be6f8a8e4557b171863f9d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 09:28:09 +00:00
Jeongik Cha
f295008821 BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration am: 05210f96b3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2563995

Change-Id: Ieaa619837f1c212265075ea59ddc74be34afd783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 09:28:02 +00:00
Treehugger Robot
2231df8a54 Merge changes from topic "b/278060169" 
* changes:
  Replace touch -a with comment
  BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration
 2023-05-23 08:56:48 +00:00
Jeongik Cha
7e00234b84 Fix build error about jar manifest 
It still depended on old intermediate files (out/host/common/obj/JAVA_LIBRARIES/<modulename>_intermediates//manifest.mf)
But the intermediate manifest.mf isn't created after aosp/2563995,
it causes merge_zip error due to missing file.
So make it use the manifest file from source directly.

Test: m out/host/common/obj/JAVA_LIBRARIES/ahat-tests_intermediates/classes-combined.jar
Bug: 278060169
Bug: 283821744
Bug: 283903672
Change-Id: Iebff6bf90b93dab693aef2492383cd3b03f239fb
 2023-05-23 05:59:09 +00:00
Treehugger Robot
2f727af4b9 Merge "Add 16K artifacts to PREBUILT_IMAGES/ dir of target_files" am: 8485145bd7 am: f6d61bd3c1 am: af0cfd9e98 
Original change: https://android-review.googlesource.com/c/platform/build/+/2595883

Change-Id: I4f6bac39abfd1ec19d21b763201770c92a2e0c3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 04:55:01 +00:00
Treehugger Robot
af0cfd9e98 Merge "Add 16K artifacts to PREBUILT_IMAGES/ dir of target_files" am: 8485145bd7 am: f6d61bd3c1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2595883

Change-Id: I18e119790d1f63e9f50ef62a008fe9da5c9de92f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 04:09:02 +00:00
Treehugger Robot
f6d61bd3c1 Merge "Add 16K artifacts to PREBUILT_IMAGES/ dir of target_files" am: 8485145bd7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2595883

Change-Id: I36815cfa877645e242d40a3b4b4cadd0e50a6ef5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 03:30:56 +00:00
Treehugger Robot
8485145bd7 Merge "Add 16K artifacts to PREBUILT_IMAGES/ dir of target_files" 2023-05-23 02:36:17 +00:00
Jeongik Cha
43aaa8989e BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration am: d0b037235d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23378947

Change-Id: I0fef5b60fe9f2aeeff7d09b55901782f3fcd8df2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 02:07:17 +00:00
Jeongik Cha
d0b037235d BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration 
* Extract BUILD_NUMBER, BUILD_HOSTNAME to file to avoid kati change
* Handle FILE_NAME_TAG_PLACEHOLDER string in dist in build/make/packaging/distdir.mk

Ignore-AOSP-First: there are internal use cases of FILE_NAME_TAG
Test: check if kati isn't invoked even though BUILD_NUMBER, BUILD_HOSTNAME
  is changed
Test: m && m, and check if the second m is no-op
Bug: 278060169
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7b40aa8338ba85a58ee481fe6bafac2959f7112b)
Merged-In: I1b37760242853c1a145bad255d0bb15524234b25
Change-Id: I1b37760242853c1a145bad255d0bb15524234b25
 2023-05-22 22:42:07 +00:00
Jeongik Cha
54403316c0 Replace touch -a with comment 
Bug: 278060169
Test: m
Change-Id: Ie5ad1b5c6cf335cc3de641fd76a76bfa5f3f79cb
 2023-05-23 07:14:51 +09:00