Commit Graph

72726 Commits

Author SHA1 Message Date
Treehugger Robot
e7af6fa1e6 Merge "Support -s in installmod command" am: 8cdc80bc24 am: 12f85f31e3
Original change: https://android-review.googlesource.com/c/platform/build/+/1869665

Change-Id: Iab5bc171ccc7295beee1e265d9f5d40734b53f0d
2021-10-26 01:49:08 +00:00
Treehugger Robot
12f85f31e3 Merge "Support -s in installmod command" am: 8cdc80bc24
Original change: https://android-review.googlesource.com/c/platform/build/+/1869665

Change-Id: I5ce4dbe1f48bd101feb1b1d6151b8cf024706ff9
2021-10-26 01:33:10 +00:00
Treehugger Robot
8cdc80bc24 Merge "Support -s in installmod command" 2021-10-26 01:15:57 +00:00
Cole Faust
3e1923867a Support -s in installmod command
The -s flag must be passed before the adb command,
as in `adb -s emulator-5554 install myapp.apk`
instead of `adb install -s emulator-5554 myapp.apk`.
Parse it and move it to the correct location if it
exists.

Test: Manually
Change-Id: I4b296d7fe4efbe3b25d21d33a8082b321787651a
2021-10-25 13:43:48 -07: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
392b2a862a Merge "Revert "Renames boot-debug-*.img in GSI targets"" am: 09f68abca7
Original change: https://android-review.googlesource.com/c/platform/build/+/1856281

Change-Id: I62a6823907586b627437012eb335c3116cafa7d1
2021-10-21 07:36:39 +00:00
Yi-Yo Chiang
09f68abca7 Merge "Revert "Renames boot-debug-*.img in GSI targets"" 2021-10-21 07:22:03 +00:00
Yi-Yo Chiang
aaf36fc33c Merge "Stop building boot-(debug|with-debug-ramdisk)-*.img for GSI/GKI" am: be32848ce6 am: b999ea377f
Original change: https://android-review.googlesource.com/c/platform/build/+/1856280

Change-Id: Ic8ca5c36e8240f5e09090e3c7d3fd30e5be18a44
2021-10-21 05:33:31 +00:00
Yi-Yo Chiang
b999ea377f Merge "Stop building boot-(debug|with-debug-ramdisk)-*.img for GSI/GKI" am: be32848ce6
Original change: https://android-review.googlesource.com/c/platform/build/+/1856280

Change-Id: I04e3545e64a0ccaa361df4bb5d3405bb51044279
2021-10-21 05:14:31 +00:00
Yi-Yo Chiang
be32848ce6 Merge "Stop building boot-(debug|with-debug-ramdisk)-*.img for GSI/GKI" 2021-10-21 04:59:33 +00:00
Treehugger Robot
b2e99eeb12 Merge "Rename cmd/main.go to cmd/canoninja.go" am: ee7853cae9 am: 9d55051dd0
Original change: https://android-review.googlesource.com/c/platform/build/+/1865276

Change-Id: I411fc804bea6788b1a030e3cac9daf0efe5612b7
2021-10-21 03:29:10 +00:00
Treehugger Robot
9d55051dd0 Merge "Rename cmd/main.go to cmd/canoninja.go" am: ee7853cae9
Original change: https://android-review.googlesource.com/c/platform/build/+/1865276

Change-Id: Ia6fede435c2f0014b29cd8ee2cb6642fba2e7f5f
2021-10-21 03:15:08 +00:00
Treehugger Robot
ee7853cae9 Merge "Rename cmd/main.go to cmd/canoninja.go" 2021-10-21 02:57:53 +00:00
Sasha Smundak
2107a731b4 Rename cmd/main.go to cmd/canoninja.go
So that it can be built and installed with
````
(cd build/make/tools/canoninja && go install cmd/canoninja.go)
```

Bug: 201713929
Test: internal
Change-Id: I38133bf26ccfae5ebf8bc3c68bc595b7274576b9
2021-10-20 15:12:07 -07: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
Treehugger Robot
e84dcc78f0 Merge changes Ie7063c46,I4ffd21bd am: d3b5946171
Original change: https://android-review.googlesource.com/c/platform/build/+/1839718

Change-Id: Id966d671cf02093c86c1b92c483acd0a20044b78
2021-10-20 20:18:54 +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
Treehugger Robot
6b7398bed0 Merge "A tool to facilitate large ninja files comparison." am: 3bd9c7d36a am: 8d9795f4d8
Original change: https://android-review.googlesource.com/c/platform/build/+/1842085

Change-Id: Ia4502afa812305de3091d68e37682680722c7790
2021-10-19 19:47:14 +00:00
Treehugger Robot
8d9795f4d8 Merge "A tool to facilitate large ninja files comparison." am: 3bd9c7d36a
Original change: https://android-review.googlesource.com/c/platform/build/+/1842085

Change-Id: I3f695f18146a7f294d00b24c7192c2bedb19d337
2021-10-19 19:28:01 +00:00
Treehugger Robot
3bd9c7d36a Merge "A tool to facilitate large ninja files comparison." 2021-10-19 19:11:35 +00:00
Sasha Smundak
26c705f764 A tool to facilitate large ninja files comparison.
Bug: 201713929
Test: internal
Change-Id: Ifd976eed1e58b7409e3deacf99917206f0149ade
2021-10-19 09:48:04 -07: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
Dan Willemsen
e666d6bf1a Merge "Shrink Mac builds" am: f478b8487b
Original change: https://android-review.googlesource.com/c/platform/build/+/1860157

Change-Id: I9f07cf95fd394e6349f10be88c4e624835348792
2021-10-19 00:35:26 +00:00
Dan Willemsen
f478b8487b Merge "Shrink Mac builds" 2021-10-19 00:32:54 +00:00
Paul Scovanner
d4566b9d31 [automerger skipped] Update SPL to 2021-12-01 am: ec6022f2e5 am: 38b8a44db6 am: 48181f100e am: 822db71705 am: a20327484d -s ours am: 7c3acbad19 -s ours
am skip reason: skipped by user pscovanner

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16009632

Change-Id: Id71619e2423a9a02b961bc4533b2749deed7740d
2021-10-18 20:32:48 +00:00
Paul Scovanner
7c3acbad19 [automerger skipped] Update SPL to 2021-12-01 am: ec6022f2e5 am: 38b8a44db6 am: 48181f100e am: 822db71705 am: a20327484d -s ours
am skip reason: skipped by user pscovanner

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16009632

Change-Id: I6e5814a2fcdc75ce8a8e5ad341fa3d27fcbc9cbf
2021-10-18 20:17:01 +00:00
Paul Scovanner
67aaf2ebc9 [automerger skipped] Update SPL to 2021-12-01 am: ec6022f2e5 am: 38b8a44db6 am: 48181f100e am: 822db71705 am: 1be1ef6734 -s ours am: fd5bf79dfd -s ours
am skip reason: skipped by user pscovanner

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16009632

Change-Id: I3dd963e3e88348046df5c9d2f58e0a5f1436c301
2021-10-18 16:53:36 +00:00
Paul Scovanner
fd5bf79dfd [automerger skipped] Update SPL to 2021-12-01 am: ec6022f2e5 am: 38b8a44db6 am: 48181f100e am: 822db71705 am: 1be1ef6734 -s ours
am skip reason: skipped by user pscovanner

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16009632

Change-Id: I62f2ae5be48f8952ce01538a4a6be49f295e84e4
2021-10-18 16:34:09 +00:00
Treehugger Robot
5e2a6a50f7 Merge "Add fsverity test key" am: ada4df3f1a am: d3df645cef
Original change: https://android-review.googlesource.com/c/platform/build/+/1853603

Change-Id: Ib875280718386c4482299be90a901042eae92dcd
2021-10-18 07:15:01 +00:00
Treehugger Robot
d3df645cef Merge "Add fsverity test key" am: ada4df3f1a
Original change: https://android-review.googlesource.com/c/platform/build/+/1853603

Change-Id: Iec893f243e9a5417fee5388968169deedc086eca
2021-10-18 07:00:14 +00:00
Treehugger Robot
ada4df3f1a Merge "Add fsverity test key" 2021-10-18 06:38:15 +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
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
Treehugger Robot
e366393004 Merge "Remove sdk-linux-x86.atree as well" am: 3ef140cf64
Original change: https://android-review.googlesource.com/c/platform/build/+/1860394

Change-Id: I536da220207a86188fd7e40a5d9bc30be3009ee1
2021-10-17 02:37:39 +00:00
Treehugger Robot
3ef140cf64 Merge "Remove sdk-linux-x86.atree as well" 2021-10-17 02:21:46 +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
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
053abd5bfb Merge "Remove old build-tools/platform-tools SDK implementation" am: 7deaa8102e
Original change: https://android-review.googlesource.com/c/platform/build/+/1859993

Change-Id: Icad8cf593ff9167e00537384f2844b06c17ff93b
2021-10-16 20:30:29 +00:00
Treehugger Robot
7deaa8102e Merge "Remove old build-tools/platform-tools SDK implementation" 2021-10-16 20:20:33 +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
152d980338 Merge "Add pcluster and deduplication support for erofs images." am: d8f17b1fc4
Original change: https://android-review.googlesource.com/c/platform/build/+/1855880

Change-Id: I5b31a9484531f05c116c125de6930143e99c4948
2021-10-16 02:15:11 +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
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
e200488cbf Merge "Re-enable disable_sparse properties." am: 093f8dcfc9
Original change: https://android-review.googlesource.com/c/platform/build/+/1835304

Change-Id: I430a4f1a01260b6fb745dec9f765e0929878bc11
2021-10-15 22:03:11 +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
Yi-Yo Chiang
92f08702dd Stop building boot-(debug|with-debug-ramdisk)-*.img for GSI/GKI
We don't need these anymore as we now export userdebug_plat_sepolicy.cil
to artifacts dist dir directly, so repack_bootimg don't need to use
boot-(debug|with-debug-ramdisk)-*.img as repack source anymore.

Bug: 202129499
Test: Check presubmit artifacts don't have boot-*debug*.img
Change-Id: I3161e42b00a93177a1a4cb3b22da2218d294b7a7
2021-10-15 19:26:39 +00:00