Commit graph

7399 commits

Author SHA1 Message Date
satayev
66bb2ab32d Move PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to default_art_config.mk.
The list of updatable system server jars must be known in
module_common.mk which is used to build mainline modules that contain
said system server jars.

module_common.mk inherit from default_art_config.mk.

Note that we could also move the defition into a separate make file,
if current change causes problems. However, places like clockwork
overwrite values of PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS instead
of appending to them, so it should not be a source of issues.

Bug: 180105615
Bug: 190407034
Test: TARGET_BUILD_VARIANT=user vendor/google/build/build_mainline_modules.sh -j64 and inspecting build artifacts
Change-Id: I771895bf0a974a4c6aa4f7374159c22536f03891
Merged-In: I771895bf0a974a4c6aa4f7374159c22536f03891
2021-06-08 15:40:22 +00:00
Mohammad Samiul Islam
0e06c113f0 Merge "Revert "Revert "Re-land "Enable apex compression on all devices with updatable apex""" into sc-dev 2021-06-03 13:59:28 +00:00
Jeff Sharkey
fcc2b97e54 platform/build/make - S is now 31
Bug: 171506470
Test: Build
Change-Id: I1f3475479659855c0185236f88bc388a61844968
2021-06-02 10:19:19 -06:00
Mohammad Islam
4a1240de8a 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
Merged-In: If0ea1168c710eeb4c90d7a9768a278a07adc48fa
Test: Manually updated APEX with same version via OTA/adb-remount and observed it was decompressed.
2021-05-26 18:21:36 +01:00
Jiyong Park
33e79ba41e Merge "Updated vndk library list after aidl-freeze-api" into sc-dev 2021-05-25 22:43:41 +00:00
Christian Wailes
dee08a8473 Merge "RESTRICT AUTOMERGE: Revert "Add the service-art JAR to the System Server classpath."" into sc-dev 2021-05-24 22:39:02 +00:00
Calin Juravle
c55bf19bd6 Merge "Add pm.dexopt.cmdline mapping in product config" into sc-dev 2021-05-24 21:34:29 +00:00
Chris Wailes
58a82ce77f RESTRICT AUTOMERGE: Revert "Add the service-art JAR to the System Server classpath."
This reverts commit efe5ca180c.

Test: m
Bug: 184281926
Change-Id: Ibbea99fe93010c52f7cdf601b1e361ce2076b83c
Merged-In: Ibbea99fe93010c52f7cdf601b1e361ce2076b83c
2021-05-24 20:29:15 +00:00
TreeHugger Robot
63383e9d75 Merge "Add GKI to generic x86_64 board" into sc-dev 2021-05-24 17:49:03 +00:00
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
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
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
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
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
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