Commit Graph

72766 Commits

Author SHA1 Message Date
Treehugger Robot
4cb46d6fc8 Merge "Support custom APEX signing tool" am: 76a4c62f56 am: c24e277d03
Original change: https://android-review.googlesource.com/c/platform/build/+/1870245

Change-Id: I23891186e5413f7db813fab0b3dfde32e9a60e91
2021-10-30 00:13:05 +00:00
Treehugger Robot
c24e277d03 Merge "Support custom APEX signing tool" am: 76a4c62f56
Original change: https://android-review.googlesource.com/c/platform/build/+/1870245

Change-Id: I3d049f984624d59db92a0ba8794ff0449c6cd47d
2021-10-29 23:56:00 +00:00
Treehugger Robot
76a4c62f56 Merge "Support custom APEX signing tool" 2021-10-29 23:39:26 +00:00
Jiakai Zhang
77734c2139 Merge "Add a build-time check for dexpreopting system server jars." am: 3f35c93578 am: 7e6337ae80
Original change: https://android-review.googlesource.com/c/platform/build/+/1853593

Change-Id: I291206db9bf455f3895dcf4ed34401cf42be1d72
2021-10-29 18:43:00 +00:00
Jiakai Zhang
7e6337ae80 Merge "Add a build-time check for dexpreopting system server jars." am: 3f35c93578
Original change: https://android-review.googlesource.com/c/platform/build/+/1853593

Change-Id: Iacac48363cbd7f14494b2705d5e0156177158703
2021-10-29 18:18:17 +00:00
Jiakai Zhang
3f35c93578 Merge "Add a build-time check for dexpreopting system server jars." 2021-10-29 18:00:51 +00:00
Jiakai Zhang
b6931f2f5b Add a build-time check for dexpreopting system server jars.
Bug: 201371822
Test: m nothing
Test: manual -
  1. Add "service-permission" to DEXPREOPT_DISABLED_MODULES (https://cs.android.com/android/platform/superproject/+/master:build/make/core/product_config.mk?q=DEXPREOPT_DISABLED_MODULES)
  2. m nothing
  3. See the error:
    Missing compilation artifacts. Dexpreopting is not working for some system server jars
    Offending entries:
    system/framework/oat/x86_64/apex@com.android.permission@javalib@service-permission.jar@classes.odex
    system/framework/oat/x86_64/apex@com.android.permission@javalib@service-permission.jar@classes.vdex

Change-Id: If29b1c367e22e302f76bfbae29588e69536414b7
2021-10-29 11:56:49 +00:00
Treehugger Robot
cd090c2a18 Merge "Use findstring to check MODULE_BUILD_FROM_SOURCE" am: bf406bc182 am: 2191f99b61
Original change: https://android-review.googlesource.com/c/platform/build/+/1870248

Change-Id: Iee94290d6d959f8910bafc9a3925a19484d035f1
2021-10-29 10:49:09 +00:00
Treehugger Robot
2191f99b61 Merge "Use findstring to check MODULE_BUILD_FROM_SOURCE" am: bf406bc182
Original change: https://android-review.googlesource.com/c/platform/build/+/1870248

Change-Id: I53379f63cc5d334a57c9755919db15b82b2b128b
2021-10-29 10:33:46 +00:00
Treehugger Robot
bf406bc182 Merge "Use findstring to check MODULE_BUILD_FROM_SOURCE" 2021-10-29 10:18:07 +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
Treehugger Robot
c9e3f3799c Merge changes from topics "is_board_platform", "soong_config_namespace" am: 2faf6d512f
Original change: https://android-review.googlesource.com/c/platform/build/+/1817592

Change-Id: Ib8da558ee1afe47a369d12bab92f888878cdd014
2021-10-28 20:13:00 +00:00
Treehugger Robot
2faf6d512f Merge changes from topics "is_board_platform", "soong_config_namespace"
* changes:
  Add board_platform_in/board_platform_is runtime functions.
  Better Soong namespace support in the RBC runtime.
2021-10-28 19:57:09 +00:00
Jooyung Han
f7c262f502 Merge changes from topic "sign_apex-sign_tool" am: f531336c6f am: 01bb43478f
Original change: https://android-review.googlesource.com/c/platform/build/+/1870244

Change-Id: I3bed861c2a9904ed07786b314f46f9266ccaf3f1
2021-10-28 05:12:17 +00:00
Jooyung Han
c404ba2e2e fix releasetools_test am: c4b7b34b4b am: 4197f3a4c6
Original change: https://android-review.googlesource.com/c/platform/build/+/1870249

Change-Id: I001ef9e90daf4813e4cdbc1a6f61f6f9c456eac1
2021-10-28 05:12:16 +00:00
Jooyung Han
01bb43478f Merge changes from topic "sign_apex-sign_tool" am: f531336c6f
Original change: https://android-review.googlesource.com/c/platform/build/+/1870244

Change-Id: I2f33a02fb08fba7d2b6485aad3f7c2e9f72c5d1c
2021-10-28 04:55:02 +00:00
Jooyung Han
4197f3a4c6 fix releasetools_test am: c4b7b34b4b
Original change: https://android-review.googlesource.com/c/platform/build/+/1870249

Change-Id: Id054a4b50c44ee736f7ced646b5fb7965645d0b2
2021-10-28 04:55:00 +00:00
Jooyung Han
f531336c6f Merge changes from topic "sign_apex-sign_tool"
* changes:
  sign_apex --sign_tool
  fix releasetools_test
2021-10-28 04:39:25 +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
Elliott Hughes
89ea1e2275 Merge "Don't package mdnsd for the host." am: 267c6a8595 am: 65af0fd0a4
Original change: https://android-review.googlesource.com/c/platform/build/+/1870882

Change-Id: I23137a8b2b9d5601ab5f9720c9914c51d878eb35
2021-10-27 22:33:01 +00:00
Elliott Hughes
65af0fd0a4 Merge "Don't package mdnsd for the host." am: 267c6a8595
Original change: https://android-review.googlesource.com/c/platform/build/+/1870882

Change-Id: I7f3f47b03e9642ac74541a547e220ce43e55c55a
2021-10-27 22:13:31 +00:00
Elliott Hughes
267c6a8595 Merge "Don't package mdnsd for the host." 2021-10-27 21:49:13 +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
Jooyung Han
0f5a41da56 sign_apex --sign_tool
A new argument is a custom signing tool for APEX contents. When
specified, apex_util invokes the tool with payload's key and payload
directory.

For now, the Virt APEX has its own custom signing tool (sign_virt_apex)
to re-sign filesystem images in it.

Bug: 193504286
Test: atest releasetools_test
Test: m sign_apex sign_virt_apex
Test: sign_apex --sign_tool sign_virt_apex --payload_key ..
  --container_key .. resigned.apex
      adb install resigned.apex
      reboot & vm run-app
Change-Id: Ic4d369c2ba42a8295044a0a75e054dc8def93208
2021-10-27 16:56:22 +09:00
Jooyung Han
c4b7b34b4b fix releasetools_test
Some test cases are failing because tests are not updated accordinly.

Bug: n/a
Test: atest releasetools_test
Change-Id: I3df071f72f01dedd6df4fa462ca52b8a0b1ffd4e
2021-10-27 16:06:10 +09:00
Treehugger Robot
ad5498f449 Merge "Allow data wipe for full OTAs" am: 2992dccd43 am: 84cef88745
Original change: https://android-review.googlesource.com/c/platform/build/+/1869634

Change-Id: I2db1de7c88b51b733c9cbd77344e87f4f38627ce
2021-10-27 05:48:19 +00:00
Treehugger Robot
84cef88745 Merge "Allow data wipe for full OTAs" am: 2992dccd43
Original change: https://android-review.googlesource.com/c/platform/build/+/1869634

Change-Id: I342cd37ec14ff6691f9dd45acb899cca7878db66
2021-10-27 05:17:58 +00:00
Treehugger Robot
2992dccd43 Merge "Allow data wipe for full OTAs" 2021-10-27 04:53:16 +00:00
Elliott Hughes
68d2f8ce91 Don't package mdnsd for the host.
I don't think anyone needs this since Brillo died.

Test: treehugger
Change-Id: Iaa7b84375c9d31f443cba4556dc25b9b00bae5f8
2021-10-26 16:38:58 -07:00
Steven Moreland
8f7396ca42 Merge "Add health to VNDK list" am: 387b39fc91 am: 422a06f4b1
Original change: https://android-review.googlesource.com/c/platform/build/+/1863316

Change-Id: Ib2c2014b0ce682b6b4a3c8d184fa496657d10da8
2021-10-26 23:15:19 +00:00
Kelvin Zhang
81641afae4 Allow data wipe for full OTAs
Test: th
Change-Id: I7a751b461a5442d22ebca07c98624f35c02dca15
2021-10-26 16:03:25 -07:00
Steven Moreland
422a06f4b1 Merge "Add health to VNDK list" am: 387b39fc91
Original change: https://android-review.googlesource.com/c/platform/build/+/1863316

Change-Id: I239c42488bdd0eb5f210dbd0d43badae5a4cd54b
2021-10-26 22:55:45 +00:00
Steven Moreland
387b39fc91 Merge "Add health to VNDK list" 2021-10-26 22:33:31 +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
Alexander Smundak
bcd3d8c4d0 Merge "Provide abspath for backward compatibility." am: d79a15a8ad
Original change: https://android-review.googlesource.com/c/platform/build/+/1836495

Change-Id: I1d8e3bf1d9a9b8d311e13f2883f251d24b3c40bb
2021-10-26 17:25:21 +00:00
Alexander Smundak
d79a15a8ad Merge "Provide abspath for backward compatibility." 2021-10-26 17:08:50 +00:00
Yifan Hong
01b140d7f1 Add health to VNDK list
Test: pass
Bug: 177269435
Change-Id: I1653670a02284542eaa39ed7dc33ccc0aec54312
2021-10-25 21:00:42 -07:00
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
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
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