Commit graph

7557 commits

Author SHA1 Message Date
TreeHugger Robot
54cb463cce Merge "Move GKI common settings to BoardConfigGkiCommon.mk" into sc-dev 2021-05-24 17:48:59 +00:00
Calin Juravle
2a3110cd73 Add pm.dexopt.cmdline mapping in product config
Test: boot
Bug: 188655918
Merged-In: I527a71d0acec0ba6593b2da1fd13818cba3b4832
(cherry picked from commit ccb4cdc7f6)
Change-Id: Iaf4d76c44e7bd46f78fd507cd5d6af26d691a7f1
2021-05-24 09:53:07 -07:00
Calin Juravle
5d1ebf5793 Merge "Add pm.dexopt.cmdline mapping in product config" am: e9423b0b09 am: 0d5c92d999
Original change: https://android-review.googlesource.com/c/platform/build/+/1710928

Change-Id: Ifeae812544cf841f8ac79fa6bfa3becafed25661
2021-05-24 15:48:03 +00:00
Calin Juravle
e9423b0b09 Merge "Add pm.dexopt.cmdline mapping in product config" 2021-05-24 15:06:35 +00:00
Jiyong Park
c6fcc77237 Updated vndk library list after aidl-freeze-api
Bug: 188713899
Test: m
Change-Id: Idf4293211069cfaa668eccb7cf382fec64353f0b
2021-05-24 08:56:47 +09:00
Michael Butler
f791bfa15c Revert "Add new llndk library, libneuralnetworks_shim.so"
This reverts commit 8685248a99.

Reason for revert: Removing libneuralnetworks_shim.so from Android S

Change-Id: I3fa3092e02e9d1bbf00d801ad68ea754bfbd8c37
Merged-In: I3fa3092e02e9d1bbf00d801ad68ea754bfbd8c37
2021-05-21 19:58:01 +00:00
Michael Butler
f148483bb2 Merge "Revert "Add new llndk library, libneuralnetworks_shim.so"" into sc-dev am: e761c25b98
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14631649

Change-Id: Ibd44720d2ab3ed364d21ecedf826f0121b666296
2021-05-21 18:23:58 +00:00
Michael Butler
e761c25b98 Merge "Revert "Add new llndk library, libneuralnetworks_shim.so"" into sc-dev 2021-05-21 17:57:00 +00:00
Hsin-Yi Chen
6968d4dc9c Add GKI to generic x86_64 board
- Remove emulator configurations from generic_x86_64/device.mk.
- Add GKI configurations to generic_x86_64/device.mk.

Test: lunch gsi_x86_64-userdebug ; make dist
Bug: 181277965
Change-Id: I43c8005afcaeec6ed70648b5f74eeed1d46f9228
Merged-In: I43c8005afcaeec6ed70648b5f74eeed1d46f9228
(cherry picked from commit b212b0a92a)
2021-05-20 03:22:27 +00:00
Chris Wailes
a1c3d7aa35 Add dalvik.vm.dexopt.thermal-cutoff system property
Test: Boot
Bug: 165935246
Bug: 181795682
Change-Id: I45a8f8d6c7e99feccacd0bc8897f791571bdd9c9
2021-05-19 16:41:41 +00:00
Tim Van Patten
ea48214581 Merge "Remove building the ANGLE APK from AOSP" 2021-05-19 15:40:27 +00:00
Calin Juravle
ccb4cdc7f6 Add pm.dexopt.cmdline mapping in product config
Test: boot
Bug: 188655918
Change-Id: I527a71d0acec0ba6593b2da1fd13818cba3b4832
2021-05-19 15:27:02 +00:00
SzuWei Lin
dea57a49e2 Move GKI common settings to BoardConfigGkiCommon.mk
There are GKI arm64 and x86_64 now. The patch restructures the
GKI common settings to a new common BoardConfig file
"BoardConfigGkiCommon.mk".

It includes the ramdisk and boot image settings for GKI.
The patch also removes obsolete TARGET_PRELINK_MODULE.

Bug: 177859525
Bug: 181277965
Test: lunch gsi_arm64-userdebug ; make dist
Test: lunch gsi_x86_64-userdebug ; make dist
Change-Id: I204c8937d97140cc3c6ed3473d494f03f534ed75
Merged-In: I204c8937d97140cc3c6ed3473d494f03f534ed75
2021-05-19 09:00:16 +00:00
Michael Butler
4f436d3760 Revert "Add new llndk library, libneuralnetworks_shim.so"
This reverts commit 8685248a99.

Reason for revert: Removing libneuralnetworks_shim.so from Android S

Bug: 188587379
Test: mma
Change-Id: I3fa3092e02e9d1bbf00d801ad68ea754bfbd8c37
2021-05-18 18:05:03 -07:00
Tim Van Patten
e6d2d6c3dd Remove building the ANGLE APK from AOSP
Mark ANGLE as product-specific and remove building the APK. CuttleFish
will continue to build the ANGLE libraries directly.

Bug: b/187342779
Test: launch_cvd --restart_subprocesses=false --start_webrtc=true --gpu_mode=guest_swiftshader
Change-Id: I6cd379a11e0c198ad72636253f1a33f2d1fc798f
2021-05-18 11:58:23 -06:00
Mohammad Islam
2b85e3ace5 Revert "Revert "Re-land "Enable apex compression on all devices with updatable apex""
This reverts commit b695e761f1.

Reason for revert: b/185708645 has been fixed

Bug: 169780183
Bug: 185708645
Change-Id: If0ea1168c710eeb4c90d7a9768a278a07adc48fa
Test: Manually updated APEX with same version via OTA/adb-remount and observed it was decompressed.
2021-05-18 17:45:07 +00:00
Hsin-Yi Chen
2ee9b4480a Merge "Add GKI to generic x86_64 board" am: abd0ea8743 am: d6af325014
Original change: https://android-review.googlesource.com/c/platform/build/+/1699575

Change-Id: I447965031e7481d65e7fb80bcd7efdec3c7a2aac
2021-05-18 06:03:27 +00:00
Hsin-Yi Chen
abd0ea8743 Merge "Add GKI to generic x86_64 board" 2021-05-18 05:16:42 +00:00
Hsin-Yi Chen
b212b0a92a Add GKI to generic x86_64 board
- Remove emulator configurations from generic_x86_64/device.mk.
- Add GKI configurations to generic_x86_64/device.mk.

Test: lunch gsi_x86_64-userdebug ; make dist
Bug: 181277965
Change-Id: I43c8005afcaeec6ed70648b5f74eeed1d46f9228
2021-05-18 02:30:50 +00:00
SzuWei Lin
2b84efab73 Merge "Move GKI common settings to BoardConfigGkiCommon.mk" am: 5b77e84a6d am: 6493a23267
Original change: https://android-review.googlesource.com/c/platform/build/+/1705170

Change-Id: Id1b5263e99f1096b43b53cbd2848d9892fdc9101
2021-05-18 01:08:46 +00:00
SzuWei Lin
5b77e84a6d Merge "Move GKI common settings to BoardConfigGkiCommon.mk" 2021-05-18 00:26:12 +00:00
Christian Wailes
a652d97483 Merge "Add dalvik.vm.dexopt.thermal-cutoff system property" am: 6f21097ca5 am: 74a8572334
Original change: https://android-review.googlesource.com/c/platform/build/+/1706465

Change-Id: I19699238eeecc6875985f06e4f1726cde49a44e0
2021-05-17 20:19:12 +00:00
Christian Wailes
6f21097ca5 Merge "Add dalvik.vm.dexopt.thermal-cutoff system property" 2021-05-17 16:15:40 +00:00
SzuWei Lin
a74ea7e569 Move GKI common settings to BoardConfigGkiCommon.mk
There are GKI arm64 and x86_64 now. The patch restructures the
GKI common settings to a new common BoardConfig file
"BoardConfigGkiCommon.mk".

It includes the ramdisk and boot image settings for GKI.
The patch also removes obsolete TARGET_PRELINK_MODULE.

Bug: 177859525
Bug: 181277965
Test: lunch gsi_arm64-userdebug ; make dist
Test: lunch gsi_x86_64-userdebug ; make dist
Change-Id: I204c8937d97140cc3c6ed3473d494f03f534ed75
2021-05-17 01:53:17 +00:00
Treehugger Robot
46cff02f70 Merge "Do not enforce debugfs restrictions on GSI builds" am: 04d72d0a46 am: 19b49a7b37 am: bb841af40d
Original change: https://android-review.googlesource.com/c/platform/build/+/1707468

Change-Id: I97f95e2f99e7b10c6852652b821eb59f76f05f8c
2021-05-14 06:12:44 +00:00
Treehugger Robot
04d72d0a46 Merge "Do not enforce debugfs restrictions on GSI builds" 2021-05-14 05:05:20 +00:00
Hridya Valsaraju
329d896e52 Do not enforce debugfs restrictions on GSI builds
Devices that launched before Android S must still be able to access
debugfs.

Bug: 188022148
Test: build boot
Change-Id: I18ecec3f7daf5a1085de40606640ead63457c4b2
2021-05-13 17:28:27 -07:00
Yifan Hong
289141549d Merge "Rectify KMI version." am: c05ef17e31 am: 655e6a2c64 am: 51e07f62db
Original change: https://android-review.googlesource.com/c/platform/build/+/1706146

Change-Id: If66a79a2dea904e509216bbd8ca80a73a95fa3c3
2021-05-13 20:31:34 +00:00
Chris Wailes
0c650895bc Add dalvik.vm.dexopt.thermal-cutoff system property
Test: Boot
Bug: 165935246
Change-Id: I45a8f8d6c7e99feccacd0bc8897f791571bdd9c9
2021-05-13 10:59:22 -07:00
Yifan Hong
29c1639715 Rectify KMI version.
Test: builds
Bug: 187913647
Bug: 187432172
Change-Id: Ic01c385b3474c78c5ac2da3b1a5a253eb241ed9b
2021-05-12 14:28:19 -07:00
Tim Van Patten
460f6d0b45 Merge "Remove ro.gfx.angle.supported from base_system.mk" into sc-dev 2021-05-12 16:59:08 +00:00
Treehugger Robot
4ea660a62d Merge "Fix GKI 2.0 signing in the release process" am: 328a537e37 am: bde804c8cf am: daab4cb7c6
Original change: https://android-review.googlesource.com/c/platform/build/+/1699576

Change-Id: I939155566577ae36fd7626a080b2187919458222
2021-05-11 14:08:19 +00:00
Bowgo Tsai
7bcb55b414 Fix GKI 2.0 signing in the release process
In the release signing process, it uses --signing_helper_with_files
for avbtool. This can be done by passing
--gki_signing_signature_args="--signing_helper_with_files=/path/to/helper.sh"
for mkbootimg.

However, this only works when there is a default value of
"gki_signing_signature_args" in the misc_info.txt, to be appended
with more extra args. Adding a default value "--prop foo:bar" to make
it work.

Note: also move the BOARD_GKI_* signing config to
BoardConfigGsiCommon.mk, so we don't have to duplicate the settings
for each architecture.

Bug: 178559811
Bug: 177862434
Test: `make bootimage`
      `unpack_bootimg --boot_img $OUT/boot.img --out unpack`
      `avbtool info_image --image ./unpack/boot_signature`
Change-Id: I8bd8ad3acf324931b47d45fd30bc590206b1927e
2021-05-11 18:10:18 +08:00
Tim Van Patten
ba4d55b905 Remove ro.gfx.angle.supported from base_system.mk
Remove ro.gfx.angle.supported from base_system.mk as a pre-requisite to
moving ANGLE to the CuttleFish-specific build. This fixes a merge
conflict that prevents the AOSP CL from landing.

Bug: 187342779
Test: make
Change-Id: I5c8b6ea71dbc066e125a072689778fe4dda1a686
2021-05-11 01:05:18 +00:00
Yifan Hong
4ec807cb77 Merge "Fix the KMI version mismatch" am: 27ec5744f5 am: f23a5dc45d am: e7774805d5
Original change: https://android-review.googlesource.com/c/platform/build/+/1681973

Change-Id: Idbac1eb8831ffd3234c242cb826dc50504a0420e
2021-05-07 20:00:58 +00:00
Yifan Hong
27ec5744f5 Merge "Fix the KMI version mismatch" 2021-05-07 19:18:15 +00:00
Howard Chen
a6bfa06b6c Fix the KMI version mismatch
Delete 5.10-android12 because it is not frozen yet.

Bug: 185445182
Bug: 186647770
Bug: 187432172
Test: build aosp_cf_arm64_phone-eng

Change-Id: Ic28cd0078ba65f92f6867c6106c1d70f442b7040
2021-05-06 19:22:51 +00:00
satayev
870137625e Merge "Sort PRODUCT_UPDATABLE_BOOT_JARS." 2021-05-06 12:53:10 +00:00
satayev
c89e4a007a Sort PRODUCT_UPDATABLE_BOOT_JARS.
At runtime it is now responsibility of derive_classpath to define value
of BOOTCLASSPATH. As we are modularizing BCP configs, the end goal is to
have a following ordering:

- ART APEX jars
- /system jars
- /system_ext jars
- /apex jars from non-updatable apexes
- /apex jars from updatable apexes

Note that /apex configs are sorted alphabetically, however they preserve
relative ordering of the jars exported from individual apexes. For
example, core-oj.jar would come before bouncycastle.jar if ART apex
defines their relative order as such.

To match end goal expectations of the APEX ordering, sort existing list
of PRODUCT_UPDATABLE_BOOT_JARS.

Bug: 180105615
Test: presubmit
Change-Id: I15512c0da79ad94b547325d563dac473c006f9fd
Merged-In: I15512c0da79ad94b547325d563dac473c006f9fd
2021-05-05 15:40:08 +01:00
TreeHugger Robot
593a8b1a5d Merge "Sort PRODUCT_UPDATABLE_BOOT_JARS." into sc-dev 2021-05-05 13:30:03 +00:00
Treehugger Robot
4be97eae2f Merge "Usee sha256 to build the hashtree in GSI image" am: f1d8833075 am: 1fa3d79a24 am: c4ad3b6d10
Original change: https://android-review.googlesource.com/c/platform/build/+/1696885

Change-Id: I9d4d92353fe0a3eea6510399e086739043c9e67e
2021-05-05 11:11:43 +00:00
Treehugger Robot
f1d8833075 Merge "Usee sha256 to build the hashtree in GSI image" 2021-05-05 10:08:32 +00:00
satayev
9425daba0c Sort PRODUCT_UPDATABLE_BOOT_JARS.
At runtime it is now responsibility of derive_classpath to define value
of BOOTCLASSPATH. As we are modularizing BCP configs, the end goal is to
have a following ordering:

- ART APEX jars
- /system jars
- /system_ext jars
- /apex jars from non-updatable apexes
- /apex jars from updatable apexes

Note that /apex configs are sorted alphabetically, however they preserve
relative ordering of the jars exported from individual apexes. For
example, core-oj.jar would come before bouncycastle.jar if ART apex
defines their relative order as such.

To match end goal expectations of the APEX ordering, sort existing list
of PRODUCT_UPDATABLE_BOOT_JARS.

Bug: 180105615
Test: presubmit
Change-Id: I15512c0da79ad94b547325d563dac473c006f9fd
2021-05-05 11:05:59 +01:00
Anton Hansson
f00b7aa361 Merge "Revert "Make module_* inherit aosp_*"" into mainline-prod am: a6920129d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14339819

Change-Id: I2a9d60dd79388c6638476baecbafccfe0d68f684
2021-05-05 08:38:07 +00:00
Bowgo Tsai
60074168da Usee sha256 to build the hashtree in GSI image
The default algorithm is sha1, which shouldn't be used now.
Becaues sha256 is more robust against malicious attacks.

Bug: 187021780
Test: TreeHugger
Change-Id: Ia325f59d09687d6d501d9710cbdd3339d7566c60
2021-05-05 12:27:09 +08:00
Treehugger Robot
8e8017b1aa Merge "Enforce debugfs restrictions on GSI builds too." am: 664959831e am: 4a454d0554 am: b277b4f469
Original change: https://android-review.googlesource.com/c/platform/build/+/1686425

Change-Id: Ibec02786a78f2f9299f2a15aeeabd7fef56c22ff
2021-05-04 17:43:24 +00:00
Treehugger Robot
664959831e Merge "Enforce debugfs restrictions on GSI builds too." 2021-05-04 16:58:40 +00:00
Anton Hansson
50b9eb21a0 Revert "Make module_* inherit aosp_*"
This reverts commit 708b854c4a.

The only diffs induced by using module_* are those incurred from using
armv8 for the 64-bit variants.

Bug: 185789027
Test: diff tests in mainline-prod and sc-mainline-prod
Change-Id: I7ed5cf93d240a58b50b655b861dd60c6965aafff
2021-04-29 12:00:39 +01:00
Treehugger Robot
65120599da Merge "Move core-icu4j.jar down in PRODUCT_BOOT_JARS." am: d9d007b271 am: 4ce5d51b69 am: a1a3711528
Original change: https://android-review.googlesource.com/c/platform/build/+/1688388

Change-Id: I06f812f1be3080cc3eb57d9506efd293c54331b7
2021-04-29 09:55:45 +00:00
Treehugger Robot
d9d007b271 Merge "Move core-icu4j.jar down in PRODUCT_BOOT_JARS." 2021-04-29 08:59:50 +00:00
satayev
188082ae34 Move core-icu4j.jar down in PRODUCT_BOOT_JARS.
For go/updatable-bootclasspath it would simplify the logic if all
system boot jars were in a single block, instead of having some apex
jars in between them.

core-icu4j.jar used to be part of ART_APEX_JARS before it moved to its
own apex. However, this change puts it after system jars in relative
ordering.

Bug: 180105615
Test: presubmit
Change-Id: Icadc1b67191172bb02d1a15bdfa3d2e6f69227aa
2021-04-28 16:58:02 +01:00
Nikita Ioffe
b71950b1c5 Merge "Revert "Re-land "Enable apex compression on all devices with updatable apex"" am: 63c81449b7 am: 07308289ce am: 558f1668fc
Original change: https://android-review.googlesource.com/c/platform/build/+/1688389

Change-Id: I77871988ff51f37fbc0a102ae13c930e2f47eab0
2021-04-27 18:22:29 +00:00
Nikita Ioffe
63c81449b7 Merge "Revert "Re-land "Enable apex compression on all devices with updatable apex"" 2021-04-27 17:02:58 +00:00
Nikita Ioffe
b695e761f1 Revert "Re-land "Enable apex compression on all devices with updatable apex"
This reverts commit 3df934b8a8.

Reason for revert: Might break weekly DF: b/185708645#comment11

Bug: 185708645
Change-Id: Ia5526e7895d27d230b1394eee666d5b3d73a08f0
2021-04-27 14:49:20 +00:00
Hridya Valsaraju
b566a9e2e4 Enforce debugfs restrictions on GSI builds too.
Debugfs build-time/run-time restrictions must be enabled on GSI builds
as well.

Test: Build, boot
Bug: 184381659
Change-Id: I940b0a2f6e22086dd479004a68bf6ad1cfe9eb13
2021-04-26 22:19:27 -07:00
Anton Hansson
9693d8bd60 Set PRODUCT_SHIPPING_API_LEVEL in module_*
This setting doesn't really make sense for unbundled builds but does
have the side-effect of turning on "full treble", which in turn is used
by some modules (libhidlbase) to conditionally use some particular -D
when compiling. The media.swcodec does not work without this define.

Bug: 185759877
Bug: 185789027
Test: compare media.swcodec apex build with module_arm64 and aosp_arm64
Merged-In: I1ebeb5f37816d8576a00ab7553cb4e9e1cab8cfa
Change-Id: I1ebeb5f37816d8576a00ab7553cb4e9e1cab8cfa
2021-04-23 15:47:21 +01:00
Anton Hansson
22fb13e8d4 Enable CFI for media module paths in module_*
This is a step on the way to make module_arm64 to produce the same
artifacts as aosp_arm64 when building unbundled modules.

Bug: 185765252
Bug: 185789027
Test: compare media.swcodec apex build with module_arm64 and aosp_arm64
Merged-In: I50d29c1d57849fd915dc771bb8e9f028fbe8efcd
Change-Id: I50d29c1d57849fd915dc771bb8e9f028fbe8efcd
2021-04-23 15:47:15 +01:00
Anton Hansson
af35677f03 Set VNDK version to current for module builds
This setting changes which libraries are included in the media.swcodec
apex, and is a step on the way of eliminating the differences when
building between module_arm64 and aosp_arm64.

Bug: 185769808
Bug: 185789027
Test: compare media.swcodec apex build with module_arm64 and aosp_arm64
Merged-In: Iafb0194827f984a7ba108f519016d24b2980e2e1
Change-Id: Iafb0194827f984a7ba108f519016d24b2980e2e1
2021-04-23 15:47:05 +01:00
Anton Hansson
1da778ce91 Merge "Set VNDK version to current for module builds" am: 85c91dcee9 am: 4daa3fb610 am: ae6fb60a0b
Original change: https://android-review.googlesource.com/c/platform/build/+/1679349

Change-Id: I6f08948fe90e9a9400cd5e47eaa3f575b2ff9553
2021-04-22 14:00:20 +00:00
Anton Hansson
85c91dcee9 Merge "Set VNDK version to current for module builds" 2021-04-22 12:51:39 +00:00
Anton Hansson
3a951869de Merge "Set PRODUCT_SHIPPING_API_LEVEL in module_*" am: e6c0eee673 am: 8b5677a3f0 am: c4477b5dec
Original change: https://android-review.googlesource.com/c/platform/build/+/1679348

Change-Id: I79db70dd014da74bd0cad35edacf0d7372b625b7
2021-04-21 15:46:51 +00:00
Anton Hansson
8454b6eb5c Merge "Enable CFI for media module paths in module_*" am: e50287e1b5 am: 9e3c0982e7 am: 24df70f1ae
Original change: https://android-review.googlesource.com/c/platform/build/+/1679347

Change-Id: I80e94d47e55c03f615b8c1709671b08776a646f6
2021-04-21 14:47:04 +00:00
Anton Hansson
d0871073ab Set PRODUCT_SHIPPING_API_LEVEL in module_*
This setting doesn't really make sense for unbundled builds but does
have the side-effect of turning on "full treble", which in turn is used
by some modules (libhidlbase) to conditionally use some particular -D
when compiling. The media.swcodec does not work without this define.

Bug: 185759877
Bug: 185789027
Test: compare media.swcodec apex build with module_arm64 and aosp_arm64
Change-Id: I1ebeb5f37816d8576a00ab7553cb4e9e1cab8cfa
2021-04-21 14:31:47 +00:00
Anton Hansson
f7ac2d31d4 Enable CFI for media module paths in module_*
This is a step on the way to make module_arm64 to produce the same
artifacts as aosp_arm64 when building unbundled modules.

Bug: 185765252
Bug: 185789027
Test: compare media.swcodec apex build with module_arm64 and aosp_arm64
Change-Id: I50d29c1d57849fd915dc771bb8e9f028fbe8efcd
2021-04-21 10:19:28 +01:00
Anton Hansson
d7995cc8e7 Set VNDK version to current for module builds
This setting changes which libraries are included in the media.swcodec
apex, and is a step on the way of eliminating the differences when
building between module_arm64 and aosp_arm64.

Bug: 185769808
Bug: 185789027
Test: compare media.swcodec apex build with module_arm64 and aosp_arm64
Change-Id: Iafb0194827f984a7ba108f519016d24b2980e2e1
2021-04-21 09:58:51 +01:00
Anton Hansson
35f4022eb7 Make module_* inherit aosp_* am: 708b854c4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14189924

Change-Id: Ibfe6f722acdec2cf42ec267a8b583567147ddb3b
2021-04-16 00:55:04 +00:00
Nikita Ioffe
8787f5903b Merge "Re-land "Enable apex compression on all devices with updatable apex" am: 9f539e2ec0 am: eee5a583fc am: 39b4cde442
Original change: https://android-review.googlesource.com/c/platform/build/+/1671807

Change-Id: I8649a032953e86531e5bced40592e1a22a33ceec
2021-04-15 17:58:35 +00:00
Nikita Ioffe
9f539e2ec0 Merge "Re-land "Enable apex compression on all devices with updatable apex" 2021-04-15 15:45:25 +00:00
Lucas Wei
3df934b8a8 Re-land "Enable apex compression on all devices with updatable apex
This reverts commit f8283a8bf6.

Test: device boots
Test: OTA from uncompressed apexes to compressed apexes works
Bug: 169780183
Bug: 184746992
Bug: 185082717
Change-Id: I62e379f44a1dcf8ebd2b3448dc1381cd99427b45
2021-04-15 15:45:02 +00:00
Anton Hansson
708b854c4a Make module_* inherit aosp_*
This reverts a previous effort to build modules without the large number
of config flags in aosp_*, as it caused unintentional diffs and test
failures.

Bug: 184018787
Test: build and install com.android.media.swcodec && adb reboot &&
      wait-for-boot && atest \
      android.provider.cts.media.MediaStore_Video_ThumbnailsTest#testInsertUpdateDelete
Change-Id: I357624136e3e5427ab8077649a699e7f4a2e299e
2021-04-15 15:21:15 +01:00
Martin Stjernholm
e118347e56 Merge the module_* device.mk files into their corresponding product mk
files.

To clean up an unnecessary indirection. Instead introduce a common file
for module products.

Test: lunch module_{arm,arm64,x86,x86_64}
      inspect the build banners
Merged-In: Ia312431a664e731f5d801ee2671f62f5cd23bd51
Change-Id: Ia312431a664e731f5d801ee2671f62f5cd23bd51
2021-04-15 15:19:50 +01:00
Treehugger Robot
2ba225f9f0 Merge "Enable GKI 2.0 signing" am: 214382e048 am: d8d232e23f am: 6cfc347cd5
Original change: https://android-review.googlesource.com/c/platform/build/+/1659680

Change-Id: I53bef0efb5db7b4d321bc9c883d6823a87e492c2
2021-04-15 08:07:36 +00:00
Roman Kiryanov
1eaa526e97 Merge "Switch emulator targets to use BOARD_BOOT_HEADER_VERSION=4" am: ac46742e38 am: 56c9341ba1 am: 3f988435a7
Original change: https://android-review.googlesource.com/c/platform/build/+/1676586

Change-Id: I3e38f8fd604c36f9c3223c4509ae3e9fdf3a8838
2021-04-15 08:07:27 +00:00
Treehugger Robot
214382e048 Merge "Enable GKI 2.0 signing" 2021-04-15 06:08:04 +00:00
Hunter Knepshield
eb3515b3d0 Merge "Create a new certificate for 2021 CTS UICCs." am: bca0e63125 am: 548fb61cd6 am: 69bb453792
Original change: https://android-review.googlesource.com/c/platform/build/+/1559795

Change-Id: I09a2737822ea891633fcac09aed7c14af88e336f
2021-04-15 05:51:28 +00:00
Roman Kiryanov
ac46742e38 Merge "Switch emulator targets to use BOARD_BOOT_HEADER_VERSION=4" 2021-04-15 05:47:50 +00:00
Roman Kiryanov
0a2ef54d3b Switch emulator targets to use BOARD_BOOT_HEADER_VERSION=4
required for androidboot

Bug: 182291166
Test: boot emulator
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Ib17f2ec6fb04eb8c7f592ec2a5d6cc886ad783c8
2021-04-14 18:18:08 -07:00
Hunter Knepshield
06353ef218 Create a new certificate for 2021 CTS UICCs.
This certificate will be used to enforce a clean break between "old" CTS
UICCs and new ones. The new UICCs will have hardware support for new
calculations that the old ones aren't capable of.

Old certificate:
./testkey.x509.pem
SHA-1: 61:ED:37:7E:85:D3:86:A8:DF:EE:6B:86:4B:D8:5B:0B:FA:A5:AF:81
SHA-256: A4:0D:A8:0A:59:D1:70:CA:A9:50:CF:15:C1:8C:45:4D:47:A3:9B:26:98:9D:8B:64:0E:CD:74:5B:A7:1B:F5:DC

New certificate:
./cts_uicc_2021.x509.pem
SHA-1: 06:97:71:39:21:E8:65:D0:1C:45:C4:A8:8D:45:7A:9D:96:F4:39:27
SHA-256: CE:7B:2B:47:AE:2B:75:52:C8:F9:2C:C2:91:24:27:98:83:04:1F:B6:23:A5:F1:94:A8:2C:9B:F1:5D:49:2A:A0

We won't yet submit the change to switch the signature of
CtsCarrierApiTestCases, as that will introduce downstream presubmit and
postsubmit failures until the new hardware is available for device labs.

Bug: 178419755
Test: temporarily switch CtsCarrierApiTestCases to be signed with
cts-uicc-2021-testkey, ensure:
  - Suite fails on a device with the old CTS SIM due to lack of carrier
  privileges
  - Suite passes with updated cuttlefish modem simulator ARF content

Change-Id: I7598426bd3e4db90a8f0d8d80ea03468fb30f876
2021-04-14 14:11:49 -07:00
Paul Duffin
84c8ff4eb2 Merge "Avoid adding jacocoagent to bootclasspath twice" am: 55e6511331 am: 2b90008ccd am: 2635f9f869
Original change: https://android-review.googlesource.com/c/platform/build/+/1675809

Change-Id: I34093b009c2a0149fcf159caede6fae18fb9bb6d
2021-04-14 20:39:42 +00:00
Paul Duffin
2e046e6c61 Avoid adding jacocoagent to bootclasspath twice
Previously:
* If EMMA_INSTRUMENT_FRAMEWORK=true then jacocoagent was
  added to the ART_APEX_JARS which itself is added to
  PRODUCT_BOOT_JARS.
* If EMMA_INSTRUMENT=true then it was added directly to the
  PRODUCT_BOOT_JARS.
* If both were true then it was added in both places ending up on the
  bootclasspath twice.

Bug: 185369704
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true droid
      m droid
Change-Id: Id1d4d1c98455cb2859ed5e4071a0cf14fb40eec4
2021-04-14 17:50:48 +01:00
Bowgo Tsai
c1bb0247fb Enable GKI 2.0 signing
This is to check the interity of a generic boot.img.

Note: build/make/target/product/gsi/testkey_rsa2048.pem is generated by:
      `openssl genrsa -out testkey_rsa2048.pem 2048`.

Bug: 177862434
Test: `make bootimage`
      `unpack_bootimg --boot_img $OUT/boot.img --out unpack`
      `avbtool info_image --image ./unpack/boot_signature`
Change-Id: I12ea4c666f71ad6b6c245d629e41904eb8d90858
2021-04-14 23:26:14 +08:00
Yo Chiang
8510485420 Merge "Revert^2 "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk""" am: dd74264737 am: c4da3f5332 am: e4b461d603
Original change: https://android-review.googlesource.com/c/platform/build/+/1664079

Change-Id: Id2f352e035ceba1e5934337b5ac28be80bc06972
2021-04-13 11:58:59 +00:00
Yo Chiang
dd74264737 Merge "Revert^2 "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk""" 2021-04-13 07:22:25 +00:00
Hans Boehm
745e272598 Merge "Revert "Enable apex compression on all devices with updatable apex"" am: 4f6f55d4e7 am: 73e6a396d5 am: 2d86cdb6ce
Original change: https://android-review.googlesource.com/c/platform/build/+/1671975

Change-Id: Ibb1696dfd20f9d4bac120da8ee71559b2b9cdc65
2021-04-10 08:03:45 +00:00
Hans Boehm
4f6f55d4e7 Merge "Revert "Enable apex compression on all devices with updatable apex"" 2021-04-10 05:42:10 +00:00
Hans Boehm
f8283a8bf6 Revert "Enable apex compression on all devices with updatable apex"
This reverts commit eaa853ad3c.

Reason for revert: breaks git_rvc-qpr-dev-plus-aosp build.

Bug: 184989544

Change-Id: Id760adaf99babe53e7cf096180032a9683587006
2021-04-10 01:06:39 +00:00
Nikita Ioffe
85a6f667b0 Merge "Enable apex compression on all devices with updatable apex" am: 359f09fd01 am: 1661d8db01 am: 3cae74dd16
Original change: https://android-review.googlesource.com/c/platform/build/+/1652340

Change-Id: Ia435d73b31353c4f0bca6ac0c2e76a821423e6f7
2021-04-09 23:04:54 +00:00
Nikita Ioffe
359f09fd01 Merge "Enable apex compression on all devices with updatable apex" 2021-04-09 21:39:11 +00:00
Nikita Ioffe
eaa853ad3c Enable apex compression on all devices with updatable apex
Test: atest ApexTestCases
Test: atest CtsStagedInstallHostTestCases
Test: coral boots
Test: checked OTA works
Change-Id: I12938b93731e0bb82b49d5d1f3815e899dafa0bf
2021-04-09 21:38:55 +00:00
SzuWei Lin
a656a7361a Merge "Export prebuilt-info.txt of perbuilts kernel to dist" am: d58ae982cf am: 3a0acd5dbe am: 344e6d261b
Original change: https://android-review.googlesource.com/c/platform/build/+/1652239

Change-Id: Ia4d336d6137c710efe027357103e16aba914bc7b
2021-04-08 12:31:42 +00:00
SzuWei Lin
d58ae982cf Merge "Export prebuilt-info.txt of perbuilts kernel to dist" 2021-04-08 09:24:05 +00:00
Janis Danisevskis
7bc7da051f Merge "Keystore 2.0: Remove keystore and keystore2.enable property." am: bacb3ebb2a am: fd04a29fe0 am: c4f4a4dc5d
Original change: https://android-review.googlesource.com/c/platform/build/+/1626719

Change-Id: I60dcef6658f18a547217fa59cf53b01fa87b3b62
2021-04-07 20:56:01 +00:00
Janis Danisevskis
bacb3ebb2a Merge "Keystore 2.0: Remove keystore and keystore2.enable property." 2021-04-07 19:30:12 +00:00
Yo Chiang
5882361bd1 Merge "gsi_skip_mount.cfg skips system sub-mountpoints" am: 7716d479cc am: 3a29a4bb95 am: 7382c3b81b
Original change: https://android-review.googlesource.com/c/platform/build/+/1659982

Change-Id: I71226eb7dd86567d2cd25159297efe956e146771
2021-04-07 06:51:17 +00:00
Yo Chiang
7382c3b81b Merge "gsi_skip_mount.cfg skips system sub-mountpoints" am: 7716d479cc am: 3a29a4bb95
Original change: https://android-review.googlesource.com/c/platform/build/+/1659982

Change-Id: I09901df8416ddd996941925f1834a7c1de2a9d29
2021-04-07 06:00:43 +00:00
Yo Chiang
7716d479cc Merge "gsi_skip_mount.cfg skips system sub-mountpoints" 2021-04-07 05:04:21 +00:00
Christian Wailes
a033000df4 Merge "Add the service-art JAR to the System Server classpath." am: 8c614d2515 am: 37c941146a
Original change: https://android-review.googlesource.com/c/platform/build/+/1595811

Change-Id: I83a193cf612c0ab4cb38405bd34cefb320c13486
2021-04-06 21:08:50 +00:00
Christian Wailes
8c614d2515 Merge "Add the service-art JAR to the System Server classpath." 2021-04-06 20:30:18 +00:00
Paul Duffin
5e496e7c15 Merge "Remove use of REMOVE_ATB_FROM_BCP" am: 9910b5e43a am: 853c2c867d am: 04173099d5
Original change: https://android-review.googlesource.com/c/platform/build/+/1662001

Change-Id: I891adf770e30ca94e358dfd3f747f83b8a5bdb2c
2021-04-06 15:27:39 +00:00
Paul Duffin
04173099d5 Merge "Remove use of REMOVE_ATB_FROM_BCP" am: 9910b5e43a am: 853c2c867d
Original change: https://android-review.googlesource.com/c/platform/build/+/1662001

Change-Id: Ic0664d1bf5622c7a45760f45670301a633cfb794
2021-04-06 14:41:52 +00:00
Paul Duffin
24f62069d0 Remove use of REMOVE_ATB_FROM_BCP
This change cleans up after the work to remove the android.test.base
classes from the bootclasspath. That work allowed the presence of
android.test.base in the bootclasspath to be configured at build time
to allow the changes to be tested without affecting the standard
Android builds and avoiding having to repeatedly reapply/revert the
changes that excluded android.test.base from the bootclasspath. That
change has been applied and stuck and no builds change the default by
setting REMOVE_ATB_FROM_BCP=false so we no longer need to support that
capability.

This change removes the build time switch to add
framework-atb-backward-compatibility to the bootclasspath and another
change in the same topic merges those classes into the
framework-minus-apex module. So, while a module has been removed from
the bootclasspath the classes available on it have not changed.

Bug: 184331423
Test: m nothing
Change-Id: I9dadaf8b0c2684bf1983b353bb2acf4f42655e1a
2021-04-06 11:53:08 +01:00
Christian Wailes
11d5f6b335 Merge "Add the service-art JAR to the System Server classpath." into sc-dev 2021-04-06 00:02:38 +00:00
Yo Chiang
d8db785ed0 Revert^2 "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk""
This reverts commit 1178673d5e.

Reason for revert: reland after aosp/1663197 is submitted

Change-Id: I3e03e62af38f329e24c057748d1e90a09a38a3b8
2021-04-03 14:56:51 +00:00
Elliott Hughes
d63b6a1054 Merge "Remove honggfuzz support." am: 4ac1818cde am: a526577693 am: a6600c241e
Original change: https://android-review.googlesource.com/c/platform/build/+/1663184

Change-Id: I0a6a96a61ec4a195c89fdd3d48a3011f01023a42
2021-04-02 22:56:23 +00:00
Elliott Hughes
a6600c241e Merge "Remove honggfuzz support." am: 4ac1818cde am: a526577693
Original change: https://android-review.googlesource.com/c/platform/build/+/1663184

Change-Id: Ia46e509718525427316575db53be1459cedc1949
2021-04-02 22:10:44 +00:00
Elliott Hughes
a445ef6cde Remove honggfuzz support.
Everyone's on libFuzzer now.

(The "fuzz" referred to in base_system.mk was removed in Android 11, but
this reference was left lying around.)

Bug: http://b/184301511
Test: treehugger
Change-Id: I6fe0f2c37e014647802279a656d2c6c9625b7a44
2021-04-02 10:24:48 -07:00
Chris Wailes
efe5ca180c Add the service-art JAR to the System Server classpath.
Bug: 177273468
Test: m
Merged-In: Iddf07fb98a86d626c993b7b175a25413f42b833c
Change-Id: Iddf07fb98a86d626c993b7b175a25413f42b833c
2021-03-31 12:31:47 -07:00
Yi-Yo Chiang
df13f6f6c8 gsi_skip_mount.cfg skips system sub-mountpoints
Bug: 184132970
Test: GSI Boot test
Change-Id: I6cb6735d41b6dc6c19a27d730226b200d362bc1d
2021-04-01 00:59:16 +08:00
Chris Wailes
ea8111cff4 Add the service-art JAR to the System Server classpath.
Bug: 177273468
Test: m
Merged-In: Iddf07fb98a86d626c993b7b175a25413f42b833c
Change-Id: Iddf07fb98a86d626c993b7b175a25413f42b833c
2021-03-30 12:38:01 -07:00
Yo Chiang
060db4f10e Merge "Revert^2 "Nextgen release: Don't build super_empty.img"" am: 910d352ee6 am: 1fe7d8ccae am: 862dd38076
Original change: https://android-review.googlesource.com/c/platform/build/+/1652241

Change-Id: I5418758e42053eba9e3e00dd52e4ca3a12ff9237
2021-03-30 08:43:53 +00:00
Yo Chiang
862dd38076 Merge "Revert^2 "Nextgen release: Don't build super_empty.img"" am: 910d352ee6 am: 1fe7d8ccae
Original change: https://android-review.googlesource.com/c/platform/build/+/1652241

Change-Id: I85039f4084566191762da1dec9782f7601b7c819
2021-03-30 08:00:00 +00:00
Yo Chiang
910d352ee6 Merge "Revert^2 "Nextgen release: Don't build super_empty.img"" 2021-03-30 06:29:09 +00:00
Remi NGUYEN VAN
f99d2f7595 Merge "Add framework-connectivity to bootclasspath" into sc-dev 2021-03-25 14:51:56 +00:00
Ulyana Trafimovich
78932b7f26 Merge "Disable <uses-library> checks for SDK products." am: 3140fc9e15 am: 9c33ee6f6a am: e64b952686
Original change: https://android-review.googlesource.com/c/platform/build/+/1652331

Change-Id: I488915a39b342ecd57a9e3484bf0d7ec4c489812
2021-03-25 12:25:27 +00:00
Ulyana Trafimovich
e64b952686 Merge "Disable <uses-library> checks for SDK products." am: 3140fc9e15 am: 9c33ee6f6a
Original change: https://android-review.googlesource.com/c/platform/build/+/1652331

Change-Id: I3f25e4d9a2837d6924209c8774d054896c3c0b14
2021-03-25 11:30:02 +00:00
Ulyana Trafimovich
3140fc9e15 Merge "Disable <uses-library> checks for SDK products." 2021-03-25 10:14:37 +00:00
Yo Chiang
075a6d3327 Revert^2 "Nextgen release: Don't build super_empty.img"
This reverts commit 63c65c776d.

Reason for revert: Original bug was resolved by updating branch config

Change-Id: I1136570f9bd01d050beb55705cc90040dd396ecc
2021-03-25 10:12:58 +00:00
SzuWei Lin
6ef237b9d0 Export prebuilt-info.txt of perbuilts kernel to dist
aosp_arm64 and gsi_arm64 build the boot.img binaries with prebuilt
kernels.Exporting the prebuilt-info.txt in dist folder makes to
easier to see which kernel build on AndroidCI.

Bug: 183504624
Test: lunch gsi_arm64-userdebug; make -j dist
Change-Id: I18f63af8588ced93e57b9d24e3b196d6f5694e72
2021-03-25 18:03:10 +08:00
Tianjie Xu
608d2aa11f Merge changes from topic "revert-1644988-nextgen-release-img-zip-cleanup-KPBTKCTROS" am: 4b2242de5e am: 402c4f9426 am: f4f10b1a0d
Original change: https://android-review.googlesource.com/c/platform/build/+/1653539

Change-Id: Ib3662301ca35fc3296debd32f571592cabe49323
2021-03-25 07:11:17 +00:00
Tianjie Xu
f4f10b1a0d Merge changes from topic "revert-1644988-nextgen-release-img-zip-cleanup-KPBTKCTROS" am: 4b2242de5e am: 402c4f9426
Original change: https://android-review.googlesource.com/c/platform/build/+/1653539

Change-Id: I85e259402ab88b98417a4b89534eabdd078f7bcc
2021-03-25 06:27:37 +00:00
Tianjie Xu
63c65c776d Revert "Nextgen release: Don't build super_empty.img"
Revert submission 1644988-nextgen-release-img-zip-cleanup

Reason for revert: b/183654818
Reverted Changes:
I2474e5fd6:Nextgen release: Don't build super_empty.img
I549439528:Add option to allow product makefiles to skip buil...

Change-Id: I91fb23542f7f70b0c1d6d3dabf97c0844956cfb0
2021-03-25 05:00:12 +00:00
Ulya Trafimovich
918f71acf7 Disable <uses-library> checks for SDK products.
They lack some libraries (e.g. RadioConfigLib), which makes it
impossible to translate their module names to library name, so the check
fails.

Bug: 183339664
Bug: 132357300
Bug: 183616134
Test: treehugger
Change-Id: I2f5f646f0fba054f9ef6a0e45afa2ecc70d5fcf0
2021-03-24 17:14:20 +00:00
Remi NGUYEN VAN
c40a51ddf6 Add framework-connectivity to bootclasspath
The framework-connectivity jar contains connectivity API classes moved
to the tethering APEX.

This currently uses framework-connectivity.impl, but will be renamed to
just framework-connectivity after combining the libraries.

Bug: 171540887
Test: m, boots
Change-Id: Iad9fedaee122e079d84ba866b8eabbd806951ab6
2021-03-24 12:20:54 +00:00
Yo Chiang
2f10270a1d Merge changes from topic "nextgen-release-img-zip-cleanup" am: 18015cef3b am: d26db0e15e am: e936355b48
Original change: https://android-review.googlesource.com/c/platform/build/+/1644989

Change-Id: Iff7166e25dd8ec8614cbbaf737085cb880632415
2021-03-24 07:26:24 +00:00
Yo Chiang
e936355b48 Merge changes from topic "nextgen-release-img-zip-cleanup" am: 18015cef3b am: d26db0e15e
Original change: https://android-review.googlesource.com/c/platform/build/+/1644989

Change-Id: I2653bdb677d86af340a9b8bf2e62385dfb4f669d
2021-03-24 06:44:59 +00:00
Yi-Yo Chiang
16973880c6 Nextgen release: Don't build super_empty.img
Bug: 183068624
Test: "m dist" on GSI and check the build artifacts under OUT and DIST
      directories, and check the contents of *-img-*.zip
Change-Id: I2474e5fd69534a5890eecd0c81e10a583e4423be
2021-03-24 05:35:37 +00:00
Przemyslaw Szczepaniak
f851149ef5 Merge "Add new llndk library, libneuralnetworks_shim.so" am: fd444b55b5 am: 8a7e8d1166 am: 9354bdc53b
Original change: https://android-review.googlesource.com/c/platform/build/+/1584864

Change-Id: Ief51da809fc14905e24a0008f9d134e065fa18e6
2021-03-23 12:50:53 +00:00
Przemyslaw Szczepaniak
9354bdc53b Merge "Add new llndk library, libneuralnetworks_shim.so" am: fd444b55b5 am: 8a7e8d1166
Original change: https://android-review.googlesource.com/c/platform/build/+/1584864

Change-Id: I1e8d228d6d3222d320b81a4d18904e849ab05444
2021-03-23 12:06:36 +00:00
Przemyslaw Szczepaniak
fd444b55b5 Merge "Add new llndk library, libneuralnetworks_shim.so" 2021-03-23 09:15:42 +00:00
SzuWei Lin
822a76daef Merge "Update OWNERS for GSI files" am: ebb3176268 am: e2080ee1ff am: a3af3a84f8
Original change: https://android-review.googlesource.com/c/platform/build/+/1645003

Change-Id: I0751575d3a4159dc4cfd6fb656d87879476cdd2c
2021-03-23 05:55:48 +00:00
SzuWei Lin
a3af3a84f8 Merge "Update OWNERS for GSI files" am: ebb3176268 am: e2080ee1ff
Original change: https://android-review.googlesource.com/c/platform/build/+/1645003

Change-Id: Ice278100e7186c49c4389eff8f3ddf4d62ea8250
2021-03-23 05:08:38 +00:00
SzuWei Lin
ebb3176268 Merge "Update OWNERS for GSI files" 2021-03-23 03:53:33 +00:00
Yo Chiang
79aea39645 Merge "Nextgen release: Don't build images that GSI don't need" am: 680a642645 am: d5c7c3eb59 am: 557b5fd283
Original change: https://android-review.googlesource.com/c/platform/build/+/1644987

Change-Id: I8201abea792289ba22e7c334da76e711204e490b
2021-03-22 08:01:05 +00:00
Yo Chiang
557b5fd283 Merge "Nextgen release: Don't build images that GSI don't need" am: 680a642645 am: d5c7c3eb59
Original change: https://android-review.googlesource.com/c/platform/build/+/1644987

Change-Id: I8ddc8daa5225ed0613285fc2b7197de6da88c0f1
2021-03-22 07:17:08 +00:00
Yi-Yo Chiang
a88d2da587 Nextgen release: Don't build images that GSI don't need
These images are never used by GSI. Building them is a waste of resource
and a potential source of confusion, for they are packaged into the
*-img-*.zip of GSI. Skip building them.

Bug: 183068624
Test: "m dist" on GSI and check the build artifacts under OUT and DIST
  directories, and check the contents of *-img-*.zip
Change-Id: Ic14cfdd10ed26d975b369ce128e4b284378219ef
2021-03-22 05:41:23 +00:00
SzuWei Lin
76d96ae6b6 Update OWNERS for GSI files
Bug: 183342911
Test: n/a
Change-Id: Ia3faa182266a8203391884d79dae56f3212a3b7e
2021-03-22 12:13:55 +08:00
Janis Danisevskis
cf8a05bbfa Keystore 2.0: Remove keystore and keystore2.enable property.
* Remove keystore as build target.
* Remove the default setting of the keystore2.enable property.

Bug: 171563717
Test: N/A
Change-Id: I2f29d18650a5e2b819985d202cb0c4002bbe94de
2021-03-19 10:31:40 -07:00
Treehugger Robot
306a6d1fcc Merge "Keystore 2.0: Enable keystore2 by default" 2021-03-19 16:06:00 +00:00
TreeHugger Robot
7830c4a383 Merge "Keystore 2.0: Enable keystore2 by default" into rvc-qpr-dev-plus-aosp 2021-03-19 15:05:00 +00:00
Przemysław Szczepaniak
8685248a99 Add new llndk library, libneuralnetworks_shim.so
libneuralnetworks_shim.so allows vendor service to run
a NNAPI Driver sAIDL service backed by a NNAPI SL Driver.
SL Driver is a shared library with a known stable C API,
that contains vendor driver implementation.

libneuralnetworks_shim.so is part of com.android.neuralnetworks
APEX package.

Test: run VTS driver sample backed by shim on CF
Bug: 172925288
Change-Id: Ibbb0af00377a2ade212740b61158274a6942be9d
2021-03-19 13:27:17 +00:00
Treehugger Robot
959b7bbca0 Merge "Update size limit for madvising odex, vdex files" am: 6a1722dddd am: 86d7b401dd am: 57c0f5bc8b
Original change: https://android-review.googlesource.com/c/platform/build/+/1646091

Change-Id: I19cebcf85e8b622335ef2167e7134d5e779e029c
2021-03-19 10:49:53 +00:00
Jagadeesh Pakaravoor
3a10cc5c11 Update size limit for madvising odex, vdex files
Update the size limit for madvising (MADV_WILLNEED)
odex and vdex files to 100MB.

Art file continues to be madvised fully, with a UINT_MAX limit.

Test: presubmit
Bug: 178853586
Change-Id: Ie46a0658bf30a6a9908ab30b28ce097e434e7e2d
2021-03-18 15:29:01 -07:00
Janis Danisevskis
74eedd9d30 Keystore 2.0: Enable keystore2 by default
Bug: 170144267
Test: N/A
Merged-In: Id9f39dc5189b7eda4617328c41a4ac4d4e3af578
Change-Id: Id9f39dc5189b7eda4617328c41a4ac4d4e3af578
2021-03-18 15:13:40 +00:00
Janis Danisevskis
c141b98eb6 Merge "Keystore 2.0: Enable keystore2 by default" into sc-dev 2021-03-18 05:12:56 +00:00
Colin Cross
8e3365e911 Merge "Do not pack symbolic link instead copying" am: 67f1a24b87 am: 04e4646dc9 am: 2f2d2d8614
Original change: https://android-review.googlesource.com/c/platform/build/+/1626199

Change-Id: I694927f50383edfaba419efeef31259ffb7214f5
2021-03-17 16:57:27 +00:00
Janis Danisevskis
88a0602582 Keystore 2.0: Enable keystore2 by default
Bug: 170144267
Test: N/A
Merged-In: Id9f39dc5189b7eda4617328c41a4ac4d4e3af578
Change-Id: Id9f39dc5189b7eda4617328c41a4ac4d4e3af578
2021-03-17 08:47:55 -07:00
Janis Danisevskis
bee0f15faa Keystore 2.0: Enable keystore2 by default
Bug: 170144267
Test: N/A
Change-Id: Id9f39dc5189b7eda4617328c41a4ac4d4e3af578
2021-03-16 15:00:10 -07:00
goodway.wang_cp
50acc66276 Do not pack symbolic link instead copying
Change-Id: I43f56276541addfd6063655e53f21fe483780bc1
Signed-off-by: goodway.wang_cp <sz755cp2369@gmail.com>
2021-03-15 17:13:50 +08:00
Treehugger Robot
c7a8f50ac5 Merge "Enable madvising of odex, vdex and art files" am: 4d71d70496 am: abdde757dd am: cfe71b4aca
Original change: https://android-review.googlesource.com/c/platform/build/+/1634679

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2390bdeb902f219719bd6ebcbc769e587afa0e38
2021-03-13 04:29:49 +00:00
Treehugger Robot
4d71d70496 Merge "Enable madvising of odex, vdex and art files" 2021-03-13 02:13:52 +00:00
Jagadeesh Pakaravoor
bee9f1d3f7 Enable madvising of odex, vdex and art files
Enable madvsing odex, vdex and art files to MADV_WILLNEED by setting the
size limits to UINT32_MAX.

Test: presubmit
Bug: 178853586
Change-Id: I7647a4be214dcd43341f216aba0a7791f877e379
2021-03-12 13:20:09 -08:00
Treehugger Robot
20ddb0d89a Merge "Workaround for existing packages check failure when the generic product is used with ART prebuilts." am: 40ea7379a8 am: 1837e64d2d am: 15d6b176ad
Original change: https://android-review.googlesource.com/c/platform/build/+/1622507

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cc28d5315947f744f8a23b0e5619ba77838d4ea
2021-03-10 21:59:07 +00:00
Martin Stjernholm
e564ec3502 Workaround for existing packages check failure when the generic
product is used with ART prebuilts.

The prebuilt packages in packages/modules/ArtPrebuilt don't get
Android.mk entries in the `generic` product (as opposed to e.g.
`aosp_arm`), so the enforce-product-packages-exist check fails there.

Exclude the ART APEX modules from the check as a workaround. It's also
necessary to remove the check for superfluous allow list entries, since
which modules are actually missing depends on many other variables (see
runtime_libart.mk).

Test: m nothing TARGET_PRODUCT=generic \
      SOONG_CONFIG_art_module_source_build=false
Bug: 172480615
Bug: 182105280
Change-Id: Id67278615f3e7c64c7658bbf1b2aa71ed6b381da
2021-03-09 12:49:06 +00:00
TreeHugger Robot
142f2ba684 Merge "update vndk list" into sc-dev 2021-03-03 10:54:57 +00:00
Brad Ebinger
21bf64a70a Remove deprecated RcsService/PresencePolling apps
There is now an AOSP API for RCS UCE, removed the
deprecated RcsService/PresencePolling app targets.

Bug: 178489990
Test: make + inspect build
Merged-In: I0eaa321dfd75de8217c465a523d439ea702deea4
Change-Id: I0eaa321dfd75de8217c465a523d439ea702deea4
2021-03-03 00:47:38 +00:00
Treehugger Robot
b1fc88399a Merge "Allow BOARD_VNDK_VERSION to be changed" am: 0181c7d33c am: 0fa0300013 am: 9831e65e7c
Original change: https://android-review.googlesource.com/c/platform/build/+/1608053

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d8ef55f5276cf90e77505d9bb91bf1e0ea8b306
2021-03-02 19:54:13 +00:00
Jeongik Cha
b84e1deb5e update vndk list
Bug: 150578172
Bug: 180417006
Test: m
Change-Id: I096b2c9f165a88c9725f4c63c87c7a9deab72f72
2021-03-02 22:46:48 +09:00
Inseob Kim
6e7693f159 Allow BOARD_VNDK_VERSION to be changed
Some devices e.g. cuttlefish include BoardConfigMainlineCommon.mk.
This allows BOARD_VNDK_VERSION to be changed other than current, to
allow mixed build experiment with BOARD_VNDK_VERSION.

Test: try setting BOARD_VNDK_VERSION and get_build_var
Change-Id: I7eb7fe6527f24ee2a3b4af32194a48ca98146a78
2021-02-25 21:22:27 +09:00
Roman Kiryanov
d3ce517627 Merge "Revert "Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish"" am: 52037cf027 am: 3cc2b4c489 am: d5fff8a680
Original change: https://android-review.googlesource.com/c/platform/build/+/1605133

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia487f8adaaf04488e68b0d3c65c24ae238484536
2021-02-24 21:54:53 +00:00
Roman Kiryanov
52037cf027 Merge "Revert "Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish"" 2021-02-24 18:26:30 +00:00
Inseob Kim
6952cb3583 Revert "Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish"
This reverts commit 05d595194b.

Reason for revert: fixed all goldfish properties

Change-Id: I7b6bf6c4fa94e0d6ba44dbc37b6451291e8fc9ad
2021-02-24 05:27:18 +00:00
TreeHugger Robot
37ce975802 Merge "update vndk list" into sc-dev 2021-02-20 15:29:19 +00:00
Brad Ebinger
ee9a6cfcd9 Merge "Remove deprecated RcsService/PresencePolling apps" into sc-dev 2021-02-19 23:12:03 +00:00
Martijn Coenen
12137e3c03 Merge "Add on-device signing binary to base." am: e484f03f0d am: 8ba24df564 am: 26b470ef49
Original change: https://android-review.googlesource.com/c/platform/build/+/1512771

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23bd4b5a1a6a01f8898cd989f753ca1d3e168b87
2021-02-19 12:54:04 +00:00
Martijn Coenen
e484f03f0d Merge "Add on-device signing binary to base." 2021-02-19 11:31:50 +00:00
Treehugger Robot
d080b339c4 Merge "update vndk list" 2021-02-19 11:06:35 +00:00
Jeongik Cha
9cc1af64e7 update vndk list
Bug: 150578172
Test: m
Change-Id: I51f582d85a70313423e81fc34fd3688bcdac9ae1
2021-02-19 11:44:09 +09:00
Jeongik Cha
248ee9f249 update vndk list
Test: m
Bug: 150578172
Change-Id: I98fa56d527124008fc60d60a7f45f200f20e5707
Merged-In: Ic53702ede81f9edbc8e29e92df4470b99b696098
2021-02-17 15:58:18 +00:00
Martin Stjernholm
caf5768920 Merge "Move ART APEX selection logic to core make." am: 43d4040f6f am: 41e93101ef am: dc903b73d0
Original change: https://android-review.googlesource.com/c/platform/build/+/1580593

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icdb8c9256b4d804bed370a85eef3d4bbfd443d9d
2021-02-17 14:16:56 +00:00
TreeHugger Robot
fbb08b8e6d Merge "update vndk list" into sc-dev 2021-02-17 13:06:42 +00:00
Treehugger Robot
e7b5f3143c Merge changes from topic "vendor_property_enforce" am: 32b84909a1 am: b1cb721609 am: 1011fd35a5
Original change: https://android-review.googlesource.com/c/platform/build/+/1571847

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53890953d1b5227d3d1e11d5d432468803f86eda
2021-02-17 08:53:27 +00:00
Martin Stjernholm
c481de01b7 Move ART APEX selection logic to core make.
It's moved from art/Android.mk that won't be available in platform
builds without ART sources.

This also ensures we depend on com.android.art directly on
PRODUCT_PACKAGES and not through LOCAL_REQUIRED_MODULES which was the
case in com.android.art-autoselect. When com.android.art is overridden
through an `overrides` field, the logic in main.mk drops it from
PRODUCT_PACKAGES, but it doesn't consider overrides when processing
LOCAL_REQUIRED_MODULES dependencies.

Bug: 172480617
Test: `m` with PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD
  set to true and false
Test: `m` on userdebug and eng builds
Change-Id: Ia606de691fe20ac19f2ca9af362408606e71b11c
2021-02-17 08:28:07 +00:00
Treehugger Robot
32b84909a1 Merge changes from topic "vendor_property_enforce"
* changes:
  Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish
  Add BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE to BoardConfig
  Add PRODUCT_SHIPPING_API_LEVEL to productVariables
2021-02-17 07:12:30 +00:00
Jeongik Cha
9513ad5599 update vndk list
Bug: 150578172
Test: m
Change-Id: If0c0105b23b1c0ab7e5563430b066823da0a954d
2021-02-17 09:55:41 +09:00
Chris Fries
550f28bbfb Merge "Revert "update vndk list"" into sc-dev 2021-02-16 21:26:36 +00:00
Steven Moreland
b5e2aa9fe1 Revert "update vndk list"
Revert submission 13566544-b/150578172

Reason for revert: breaks P21 b/180417006
Reverted Changes:
I6905a2aa9:Add temporary allowlist for old version scheme
Ic53702ede:update vndk list

Change-Id: I8f10701bad29f33ce8904535c632f7f4a22cd6b7
2021-02-16 21:00:17 +00:00
Gavin Corkery
b21535182b Merge changes from topic "reboot-readiness-libs" into sc-dev
* changes:
  Add framework-scheduling to UPDATABLE_BOOT_JARS
  Add com.android.scheduling to system partition
2021-02-16 17:48:20 +00:00
TreeHugger Robot
55ca5ae7c5 Merge "update vndk list" into sc-dev 2021-02-16 12:33:59 +00:00
Jeongik Cha
46cdb2f9fc update vndk list
Bug: 150578172
Test: m
Change-Id: Ic53702ede81f9edbc8e29e92df4470b99b696098
2021-02-16 09:48:20 +00:00
Treehugger Robot
df0880a6d8 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/make" am: 14201eb3a3 am: 27d927752e am: 11fc9e03e2
Original change: https://android-review.googlesource.com/c/platform/build/+/1589084

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I868c39bb0d7efa427c63797ab2da8e7fb82c4132
2021-02-16 01:02:06 +00:00
Bob Badour
0390580262 [LSC] Add LOCAL_LICENSE_KINDS to build/make
Added SPDX-license-identifier-Apache-2.0 to:
  target/product/sysconfig/Android.bp
  tools/apicheck/Android.bp
  tools/product_config/Android.bp
  tools/releasetools/Android.bp
  tools/signapk/Android.bp
  tools/signtos/Android.bp
  tools/zipalign/Android.bp
  tools/ziptime/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-CC-BY SPDX-license-identifier-GPL
    SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL
    SPDX-license-identifier-MIT legacy_not_a_contribution
    legacy_restricted
to:
  Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-CC-BY SPDX-license-identifier-GPL
    SPDX-license-identifier-MIT
to:
  tools/Android.bp
  tools/droiddoc/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0
    SPDX-license-identifier-LGPL SPDX-license-identifier-MIT
to:
  core/base_rules.mk
  core/dex_preopt_libart.mk
  core/package_internal.mk

Added SPDX-license-identifier-Apache-2.0 legacy_not_a_contribution
to:
  target/board/Android.mk

Added legacy_restricted
to:
  core/tasks/tools/package-modules.mk
  target/product/gsi/Android.bp
  target/product/gsi/Android.mk
  target/product/security/Android.bp
  target/product/security/Android.mk
  tools/acp/Android.bp
  tools/atree/Android.bp
  tools/fs_config/Android.bp
  tools/fs_config/Android.mk
  tools/fs_get_stats/Android.bp
  tools/libhost/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: Id67a4eb1312940f999643b2ae57f45f34f120724
2021-02-14 10:37:20 -08:00
Yo Chiang
2de21432a1 Merge "Revert "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk"" am: 25d0acf00f am: 384b0b319a am: 3e9774f8fe
Original change: https://android-review.googlesource.com/c/platform/build/+/1588251

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e4ab6207c1a29f7a9cf33a2c6613330f9921ad2
2021-02-13 10:33:17 +00:00
Yo Chiang
25d0acf00f Merge "Revert "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk"" 2021-02-13 06:09:36 +00:00
Yo Chiang
1178673d5e Revert "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk"
This reverts commit ecaa592310.

Reason for revert: b/177495407#comment9 breaks aosp_arm

Exempt-From-Owner-Approval: Clean revert

Change-Id: If4586901fc1806c5394a385c8686ef5fd8748f24
2021-02-13 06:08:54 +00:00
Yo Chiang
f73fdc3d79 Merge "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk" am: 2ecbebdcd2 am: e42e3a293b am: b4be190fb7
Original change: https://android-review.googlesource.com/c/platform/build/+/1553835

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d4b2e8cfedd12cf2ab1958d51f2706dad973138
2021-02-12 11:12:54 +00:00
Yo Chiang
2ecbebdcd2 Merge "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk" 2021-02-12 09:35:55 +00:00
Peter Kalauskas
ceeeba0753 Merge "Fix pm.dexopt.first-boot for eng builds" am: a632e7f855 am: 449e59c8fb am: 2c260f3b68
Original change: https://android-review.googlesource.com/c/platform/build/+/1584212

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iddb8c26d097939e1b77d21a5216ac84b6fa6414a
2021-02-11 20:28:54 +00:00
Peter Kalauskas
9255f59f9b Fix pm.dexopt.first-boot for eng builds
Fix pm.dexopt.first-boot missing on -eng builds causing device not to
boot

Test: Build -eng target, confirm device boots
Bug: 179990152
Change-Id: Ic963a0f7db5a39aff6198842c468de99e4949900
2021-02-11 10:45:08 -08:00
Calin Juravle
91a1d73fb0 Merge "Update the default compiler filter used at boot time" am: 95f5213202 am: a0e8fb0856 am: 93ad65f026
Original change: https://android-review.googlesource.com/c/platform/build/+/1573378

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifcf7ae45f01b80553524aca5f869f6870cdfa3d9
2021-02-11 03:50:52 +00:00
Calin Juravle
95f5213202 Merge "Update the default compiler filter used at boot time" 2021-02-11 02:07:59 +00:00
Yan Yan
57b9916d03 Merge "Add IKE to bcp and remove it from system server classpath" 2021-02-10 18:41:41 +00:00
Gavin Corkery
c97637636e Add framework-scheduling to UPDATABLE_BOOT_JARS
Test: Manual
Bug: 161353402
Change-Id: Ie32c9d6a50fa5ef41f421636ae6ac32fd7b60f46
2021-02-10 09:13:39 +00:00
Gavin Corkery
a270b161b4 Add com.android.scheduling to system partition
Test: Flash, check package is in /system
Bug: 161353402
Change-Id: Ib25bb5a11348f8e66efb473242803459fb992998
2021-02-10 09:10:17 +00:00
TreeHugger Robot
7438c6b970 Merge "Add IKE to bcp and remove it from system server classpath" into sc-dev 2021-02-10 02:52:06 +00:00
Treehugger Robot
1975c1ba63 Merge changes from topic "ps 2.0 cp"
* changes:
  update vndk list
  powerstats: PowerStats HAL has been renamed
  Create Power Stats AIDL interface
2021-02-09 19:20:10 +00:00
Calin Juravle
b7e744cd82 Update the default compiler filter used at boot time
For the first-boot (happening after upgrades) use verify as quicken is deprecated.

For the usual boot operations use extract instead of the verify. Under normal behaviour all apps should already be optimized (either with the first-boot option, a/b option or in bg-dexopt). This will speed up the boot process in corner cases and reduce resource contention that could make the device janky in at boot time.

Bug: 172114559
Change-Id: I33f204911bdc825bf6731feb5cea7c260382798b
Test: m
2021-02-08 14:25:46 -08:00
Treehugger Robot
a06d7685a8 Merge "Keystore 2.0: Disable keystore 2 by default (for now)" am: 7ef7116014 am: 38aea6ebe4 am: 13ad4052b9
Original change: https://android-review.googlesource.com/c/platform/build/+/1578147

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85a61be24bfd40b8fb6f788a1c75fcf2d7bcb2ee
2021-02-08 21:39:26 +00:00
Treehugger Robot
7ef7116014 Merge "Keystore 2.0: Disable keystore 2 by default (for now)" 2021-02-08 20:04:38 +00:00
Yo Chiang
ecaa592310 Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk
Set PRODUCT_SHIPPING_API_LEVEL to the latest value (instead of empty) so
that GSIs are always built with the latest build system default configs,
such as PRODUCT_FULL_TREBLE := true and
PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true.

Bug: 177495407
Test: Presubmit build_test
Change-Id: Iabd67656c5ed1de8327c40f0f9f604841f24764b
2021-02-08 12:45:15 +08:00
Janis Danisevskis
a3c5395672 Keystore 2.0: Disable keystore 2 by default (for now)
Test: System starts without keystore 2 running.
Bug: 160623310
Change-Id: I83d54de602a0f70acc91fd8e55b07706e1b4e55b
2021-02-05 14:39:43 -08:00