Commit Graph

28548 Commits

Author SHA1 Message Date
Treehugger Robot
3ebfcd4b55 Merge changes from topics "is_board_platform", "soong_config_namespace" am: 2faf6d512f am: c9e3f3799c am: 152b6e5021
Original change: https://android-review.googlesource.com/c/platform/build/+/1817592

Change-Id: I53aea00fb57331935cd1f40f5f9b361a466102f9
2021-10-28 20:42:09 +00:00
Treehugger Robot
152b6e5021 Merge changes from topics "is_board_platform", "soong_config_namespace" am: 2faf6d512f am: c9e3f3799c
Original change: https://android-review.googlesource.com/c/platform/build/+/1817592

Change-Id: Ie7209a143f54a12d51d1170148ad5151cf74a637
2021-10-28 20:30:42 +00:00
Cheonho Park
440467376e Use findstring to check MODULE_BUILD_FROM_SOURCE
Android 12 can have _compressed target
(e.g com.google.android.conscrypt_compressed),
changed function from `filter` to `findstring`

Same change applied to com.google.android.art checking

Also modify to check `true` value of the MODULE_BUILD_FROM_SOURCE
to filter out both unset variable and `false`

Test: adding one error code temporally, install prebuilt
  train, and check result with,without this fix

    MODULE_BUILD_FROM_SOURCE := true
  + $(error we are here, true $(PRODUCT_PACKAGES))
  endif

Bug: 197282276
Change-Id: I864ba1bb5da61ccc6b8576029ab6c569959b2c93
2021-10-27 23:53:29 +00:00
Jooyung Han
8caba5e14e Support custom APEX signing tool
When an APEX specifies its custom signing tool (custom_sign_tool:),
apexkeys.txt contains the info and sign_target_files_apks pass the value
to apex_util.

For now the Virt APEX has its own custom signing tool (sign_virt_apex),
which is added to OTATOOLS.

Bug: 193504286
Test: sign_target_files_apks invokes sign_virt_apex
Change-Id: Iba845723fe3e18f542963324b9c58cd00914c5ba
2021-10-27 16:56:22 +09:00
Alexander Smundak
ee177cdac2 Merge "Provide abspath for backward compatibility." am: d79a15a8ad am: bcd3d8c4d0 am: 5541add6e2
Original change: https://android-review.googlesource.com/c/platform/build/+/1836495

Change-Id: Ic91017eef8a609adcdb8c1c1ed9e692a37e6e25a
2021-10-26 18:06:14 +00:00
Alexander Smundak
5541add6e2 Merge "Provide abspath for backward compatibility." am: d79a15a8ad am: bcd3d8c4d0
Original change: https://android-review.googlesource.com/c/platform/build/+/1836495

Change-Id: Iaff496df30b8a5dde5d6cd5ccad91bb739d341e5
2021-10-26 17:46:31 +00:00
Ulya Trafimovich
7693ec7e03 Deprecate system server jars defined in Android.mk.
Add PRODUCT_BROKEN_DEPRECATED_MK_SYSTEM_SERVER_JARS variable that is
undefined by default. Setting that variable to true enables support for
system server jars defined in Android.mk. It should be enabled on a
per-product basis in product makefiles.

Bug: 203618671
Test: m nothing
Change-Id: If90d7131d37f308c468e395c236d5aa5ad053bad
2021-10-26 14:47:24 +01:00
Sasha Smundak
3370ad5b70 Add board_platform_in/board_platform_is runtime functions.
Bug: 190051051
Test: treehugger
Change-Id: I27269fc0f0f7063635fbb1b1645919b604afb762
2021-10-25 10:41:56 -07:00
Sasha Smundak
dc154164db Better Soong namespace support in the RBC runtime.
Includes:
* Defining namespace again should have no effect
* Allow appending to a variable defined in a namespace
* Consistent naming
* Print namespace variable assignments even if they are empty

Bug: 200297238
Test: rbcrun make/build/tests/run.rbc
Change-Id: I64aa22c4498ae89e4bc3a077d6206ad37d5c7c38
2021-10-25 10:41:46 -07:00
Sasha Smundak
da2f56ebe4 Provide abspath for backward compatibility.
Bug: 194864642
Test: N/A
Change-Id: Ie30c57d8ea93e4247911b6ebf6fd5a3a469ac5e7
2021-10-25 10:33:16 -07:00
Yi-Yo Chiang
4ca824ce0f Merge "Revert "Renames boot-debug-*.img in GSI targets"" am: 09f68abca7 am: 392b2a862a am: 556830ad1e
Original change: https://android-review.googlesource.com/c/platform/build/+/1856281

Change-Id: Ie3640dda0c19c27d6ba3e1b4496540ce12d49336
2021-10-21 08:15:07 +00:00
Yi-Yo Chiang
556830ad1e Merge "Revert "Renames boot-debug-*.img in GSI targets"" am: 09f68abca7 am: 392b2a862a
Original change: https://android-review.googlesource.com/c/platform/build/+/1856281

Change-Id: I2e78e1108dd509e40b7eb585da8856edb692940b
2021-10-21 07:57:59 +00:00
Yi-Yo Chiang
09f68abca7 Merge "Revert "Renames boot-debug-*.img in GSI targets"" 2021-10-21 07:22:03 +00:00
Treehugger Robot
b110a947c7 Merge changes Ie7063c46,I4ffd21bd am: d3b5946171 am: e84dcc78f0 am: e61e3b6c5e
Original change: https://android-review.googlesource.com/c/platform/build/+/1839718

Change-Id: I1ab84120c9dd113635a96ff216ffb4984e7fd785
2021-10-20 21:00:41 +00:00
Treehugger Robot
e61e3b6c5e Merge changes Ie7063c46,I4ffd21bd am: d3b5946171 am: e84dcc78f0
Original change: https://android-review.googlesource.com/c/platform/build/+/1839718

Change-Id: I7d4a79c55b5ebc82f905ef28833b0e7a227ac7a6
2021-10-20 20:44:56 +00:00
Android Build Coastguard Worker
53d8aa9e90 Version bump to SP1A.211105.004 [core/build_id.mk]
Change-Id: I5efdc7bbff1a82c3827d35649eab32d288828c06
2021-10-20 20:28:38 +00:00
Treehugger Robot
d3b5946171 Merge changes Ie7063c46,I4ffd21bd
* changes:
  Provide is-vendor-board-qcom macro.
  Better Soong config namespace support makefile macros.
2021-10-20 20:03:52 +00:00
Dan Willemsen
4d18bcb141 Merge "Shrink Mac builds" am: f478b8487b am: e666d6bf1a am: 67dd4bb8f0
Original change: https://android-review.googlesource.com/c/platform/build/+/1860157

Change-Id: I4c7be9892793663243cbecf13f14ab2e2c8fb5db
2021-10-19 01:05:35 +00:00
Dan Willemsen
67dd4bb8f0 Merge "Shrink Mac builds" am: f478b8487b am: e666d6bf1a
Original change: https://android-review.googlesource.com/c/platform/build/+/1860157

Change-Id: Ic631807b15aa8310dbe06d3db413876646b95b31
2021-10-19 00:47:10 +00:00
Yi-Yo Chiang
ffb366ee99 Revert "Renames boot-debug-*.img in GSI targets"
This reverts commit a2a5db4466.

Reason for revert: original change was obsoleted by
  I3161e42b00a93177a1a4cb3b22da2218d294b7a7

Bug: 202129499
Test: Presubmit; change should be noop
Change-Id: Ib7be1ed73dbf08758276666f8ce35ed9cbf18a36
2021-10-18 06:33:51 +00:00
Dan Willemsen
349dc07933 Shrink Mac builds
Device builds are no longer supported on Mac, but we do support building
various host tools, including the SDK build-tools and platform-tools
packages. All of these are defined in Soong now, so we stop reading all
the Android.mk files, and defining and depending on the device output
targets.

Bug: 187222815
Test: `m`, `m dist`, etc on Mac
Change-Id: Ibb19756d44f2cbc6948381043115718ffc3f4b7d
2021-10-17 00:28:39 -07:00
Treehugger Robot
01aae4be73 Merge "Remove sdk-linux-x86.atree as well" am: 3ef140cf64 am: e366393004 am: 9b435afddb
Original change: https://android-review.googlesource.com/c/platform/build/+/1860394

Change-Id: I0de551ce977800f990af961aaf28bd25769efc0d
2021-10-17 03:11:24 +00:00
Treehugger Robot
9b435afddb Merge "Remove sdk-linux-x86.atree as well" am: 3ef140cf64 am: e366393004
Original change: https://android-review.googlesource.com/c/platform/build/+/1860394

Change-Id: Ibda2da68c08dc7bd794791dd7e983c6c9a571247
2021-10-17 02:57:13 +00:00
Dan Willemsen
53c98f7f6d Remove sdk-linux-x86.atree as well
I missed this one in my last change.

Bug: 187222815
Change-Id: Ibdbde80fe531d53ce9e89136211bdf85932c058c
2021-10-16 16:49:41 -07:00
Treehugger Robot
8a42aedbeb Merge "Remove old build-tools/platform-tools SDK implementation" am: 7deaa8102e am: 053abd5bfb am: 2e7fd08c1c
Original change: https://android-review.googlesource.com/c/platform/build/+/1859993

Change-Id: I2aa71352bf414ec144b17ce9c7d81ab22ec800ae
2021-10-16 20:59:14 +00:00
Treehugger Robot
2e7fd08c1c Merge "Remove old build-tools/platform-tools SDK implementation" am: 7deaa8102e am: 053abd5bfb
Original change: https://android-review.googlesource.com/c/platform/build/+/1859993

Change-Id: Id94f98f00b2b2108924c0e02a0a3c4495d85a62a
2021-10-16 20:40:44 +00:00
Treehugger Robot
7deaa8102e Merge "Remove old build-tools/platform-tools SDK implementation" 2021-10-16 20:20:33 +00:00
Treehugger Robot
0ad7bb9dc8 Merge "Add pcluster and deduplication support for erofs images." am: d8f17b1fc4 am: 152d980338 am: b2c9e3267a
Original change: https://android-review.googlesource.com/c/platform/build/+/1855880

Change-Id: I23df771ce5c1a67dffd4929291a7361ceb2124d9
2021-10-16 02:50:40 +00:00
Treehugger Robot
b2c9e3267a Merge "Add pcluster and deduplication support for erofs images." am: d8f17b1fc4 am: 152d980338
Original change: https://android-review.googlesource.com/c/platform/build/+/1855880

Change-Id: I4a89d85286bc8000621fb32b4db5f7d8cff0d42e
2021-10-16 02:33:23 +00:00
Treehugger Robot
d8f17b1fc4 Merge "Add pcluster and deduplication support for erofs images." 2021-10-16 01:56:43 +00:00
Sasha Smundak
c0fde810ba Provide is-vendor-board-qcom macro.
`is-vendor-board-qcom` supplants `is-vendor-board-platform` as the latter's
second operand is always `QCOM`. To check that BOARD is a QCOM one, write:

```
ifneq (,$(call is-vendor-board-qcom,BOARD))
```

Using `is-vendor-board-qcom` before its implied operands `TARGET_BOARD_PLATFORM`
and `QCOM_BOARD_PLATFORMS` are set is an error.

Bug: 201477826
Test: treehugger
Change-Id: Ie7063c46b7eda092438a59f3682486dd39af3d0b
2021-10-15 15:39:28 -07:00
Sasha Smundak
c5d5bb424f Better Soong config namespace support makefile macros.
Implement two new macros, `soong_config_set` and `soong_config_append`,
which will eventually replace the existing add_soong_config_xxx. With the
new macros, namespace declaration is implicit, and a value can be appended
to a variable in the namespace.

Bug: 200297238
Test: treehugger

Change-Id: I4ffd21bdb6d93db3b1630703fc5f766649b4152c
2021-10-15 15:39:15 -07:00
Treehugger Robot
40661fd85a Merge "Re-enable disable_sparse properties." am: 093f8dcfc9 am: e200488cbf am: 92f9a299e3
Original change: https://android-review.googlesource.com/c/platform/build/+/1835304

Change-Id: I06ea68a0333ad167bb3551d63ed8ed6cae4f32a7
2021-10-15 22:39:03 +00:00
Treehugger Robot
92f9a299e3 Merge "Re-enable disable_sparse properties." am: 093f8dcfc9 am: e200488cbf
Original change: https://android-review.googlesource.com/c/platform/build/+/1835304

Change-Id: If32f7a974d76e26c66dafeeb0abc3aaa1d34836b
2021-10-15 22:20:57 +00:00
Treehugger Robot
093f8dcfc9 Merge "Re-enable disable_sparse properties." 2021-10-15 21:44:14 +00:00
Dan Willemsen
39b81cdc7a Remove old build-tools/platform-tools SDK implementation
Since those were the only components of the Windows SDK, this removes a
lot of special casing around that as well.

Bug: 187222815
Change-Id: I2690aadcf78e9ccad43314c8475893e81a2e2735
2021-10-15 14:22:07 -07:00
Pierre-Clément Tosi
3c25c0452f Merge "Introduce BOARD_PVMFWIMAGE_PARTITION_SIZE" am: 88cceca4c5 am: dc5093faea am: 072dec09fe
Original change: https://android-review.googlesource.com/c/platform/build/+/1844301

Change-Id: Iecc095bcf18e0592f825964274aa3b646c2f98e4
2021-10-15 07:30:27 +00:00
Pierre-Clément Tosi
072dec09fe Merge "Introduce BOARD_PVMFWIMAGE_PARTITION_SIZE" am: 88cceca4c5 am: dc5093faea
Original change: https://android-review.googlesource.com/c/platform/build/+/1844301

Change-Id: I15be9a1d036bddbc51076bd42da1a66a641aff56
2021-10-15 07:14:17 +00:00
Pierre-Clément Tosi
88cceca4c5 Merge "Introduce BOARD_PVMFWIMAGE_PARTITION_SIZE" 2021-10-15 06:44:04 +00:00
Pierre-Clément Tosi
bc62c55f82 Merge "Add pvmfw.img to IMAGES for BUILT_TARGET_FILES_PKG" am: 85da2d3713 am: 9213155245 am: dcc0ecae5a
Original change: https://android-review.googlesource.com/c/platform/build/+/1849513

Change-Id: I743c78be0587cbe081ab2674ce6c32a614f694f3
2021-10-14 09:56:48 +00:00
Pierre-Clément Tosi
dcc0ecae5a Merge "Add pvmfw.img to IMAGES for BUILT_TARGET_FILES_PKG" am: 85da2d3713 am: 9213155245
Original change: https://android-review.googlesource.com/c/platform/build/+/1849513

Change-Id: I22f87d3bb3d3a5d1aaeb02e81f79025e6f67053b
2021-10-14 09:41:56 +00:00
Pierre-Clément Tosi
85da2d3713 Merge "Add pvmfw.img to IMAGES for BUILT_TARGET_FILES_PKG" 2021-10-14 09:11:33 +00:00
TreeHugger Robot
63756dbf3a Merge "[DO NOT MERGE] am: 16eff988ab" into sc-qpr1-dev-plus-aosp 2021-10-14 02:29:54 +00:00
Yi-Yo Chiang
1755fcdb9f Merge "Cleanup dependencies of debug boot images" am: 5ba458f71d am: 830e17a9e3
Original change: https://android-review.googlesource.com/c/platform/build/+/1843155

Change-Id: I7b305664f63cef30efb2c3f1a9870b90ebd2d7a1
2021-10-13 10:31:56 +00:00
Yi-Yo Chiang
5ba458f71d Merge "Cleanup dependencies of debug boot images" 2021-10-13 09:58:23 +00:00
David Anderson
64b351b882 Add pcluster and deduplication support for erofs images.
This adds BOARD_xIMAGE_EROFS_PCLUSTER_SIZE and
BOARD_EROFS_PCLUSTER_SIZE, which set the "pcluster size" of erofs images
for individual images or all erofs images respectively. The pcluster
size affects the maximum size of a physical compressed block.

This also adds BOARD_EROFS_SHARE_DUP_BLOCKS, which turns on chunk
support in EROFS.

Bug: 201685920
Test: manual test
Change-Id: I27ec0899f89890562796dd9fa567fc74182fbefb
2021-10-13 01:03:10 -07:00
Paul Scovanner
f50786e787 [DO NOT MERGE] am: 16eff988ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16009002

Change-Id: I2ea29920ebf373a58b246379e98df05843c3a711
2021-10-12 22:07:26 +00:00
Paul Scovanner
16eff988ab [DO NOT MERGE]
Update SPL to 2021-12-05

Bug: 202436544
Change-Id: Ib03873315839e4858f93d1ebbbc17054d46246c9
Merged-In: Ic0dabce4beb09bdd966152c059730677ca5bf5aa
2021-10-11 22:57:45 +00:00
Colin Cross
e88571487b Merge "Use the Soong output as the checkbuild target" am: 54686043a8 am: b808b63b47
Original change: https://android-review.googlesource.com/c/platform/build/+/1851043

Change-Id: I8d4c634390051de3367fb434824b1b7463bce35d
2021-10-11 18:48:20 +00:00
Colin Cross
fd54f03d1b Use the Soong output as the checkbuild target
Save disk space when building checkbuild by avoiding copying the Soong
output file into the Make intermediates directory.

All the same files in out/soong that were created by m checkbuild before
this patch are still created after this patch.  In the internal branch
the total size of the out directory after m checkbuild is reduced from
1320 GB to 965 GB.

Bug: 201816050
Test: m checkbuild
Change-Id: I6370df44f9baab00fcfe30c072600fe58109954d
2021-10-09 13:33:40 -07:00