Commit graph

5395 commits

Author SHA1 Message Date
Bowgo Tsai
3c77151b46 Adding adb_debug.prop into generic_ramdisk.mk
After commit I59cd149e0021211b8fd59c44b93bbf18dc8637bf, init_first_stage
is no longer installed to the ramdisk when BOARD_USES_RECOVERY_AS_BOOT
is True (see b/190974433 for details and init/Android.mk in that commit).

adb_debug.prop, which is needed for boot-debug.img,
boot-test-harness.img, etc.,will be absent when
BOARD_USES_RECOVERY_AS_BOOT is true, because adb_debug.prop is
only required by the init_first_stage.

Adding adb_debug.prop into generic_ramdisk.mk to include it
unconditionally.

Bug: 192432810
Test: flash boot-debug.img on a user build, check `adb root` works
Change-Id: I234b3430af1b8b09aeb46aef928ca8e16ad452cc
2021-07-01 16:34:29 +08:00
Martin Stjernholm
28f96414fd Do not complain about unexpected lsdump files when building with
prebuilt APEXes.

Test: m droid SOONG_CONFIG_art_module_source_build=false
Bug: 172480615
Change-Id: Ic75e769dce1ec3440407fe8e88973ae7ed25b651
2021-06-28 16:20:53 +01:00
Treehugger Robot
92fb9274d9 Merge "Add libbinder_rpc_unstable to system image" 2021-06-17 21:43:55 +00:00
Hridya Valsaraju
32bd512b9e Merge "Disable build-time debugfs restrictions on GSI builds" 2021-06-16 17:38:56 +00:00
Hridya Valsaraju
2a2a97afba Disable build-time debugfs restrictions on GSI builds
These restrictions enable macros that disable sepolicy access to debugfs
for unauthorized clients on S-launching devices. However, since the
Android S GSI build must also be fully functional on earlier devices
that could have possibly depended on debugfs, disable the build-time
restrictions on GSI builds.

Bug: 184381659
Test: make
Change-Id: I583693df5c30d9bab28f76a6c1e4e9db8e5fd89f
2021-06-14 14:32:44 -07:00
Victor Hsieh
b2d86af939 Add libbinder_rpc_unstable to system image
Bug: 190547489
Bug: 189947807
Test: m
Change-Id: Ib3b1d10e6f09de54966ab6c02f170b0feef17241
2021-06-10 09:54:11 -07:00
satayev
d56062009a 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
Merged-In: Id867ec12ab546613f63a50d608192ab5134f65bb
(cherry picked from commit 66bb2ab32d)
2021-06-10 12:46:54 +00:00
Mohammad Islam
dfa58118a6 Merge "Revert "Revert "Re-land "Enable apex compression on all devices with updatable apex""" 2021-06-02 10:01:19 +00:00
Michael Butler
63d66d3fe1 Merge "Revert "Add new llndk library, libneuralnetworks_shim.so"" 2021-05-27 18:05:25 +00:00
Calin Juravle
e9423b0b09 Merge "Add pm.dexopt.cmdline mapping in product config" 2021-05-24 15:06:35 +00: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
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
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
Christian Wailes
6f21097ca5 Merge "Add dalvik.vm.dexopt.thermal-cutoff system property" 2021-05-17 16:15:40 +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
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
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
664959831e Merge "Enforce debugfs restrictions on GSI builds too." 2021-05-04 16:58:40 +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
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
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
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
Treehugger Robot
214382e048 Merge "Enable GKI 2.0 signing" 2021-04-15 06:08:04 +00: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
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
dd74264737 Merge "Revert^2 "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk""" 2021-04-13 07:22:25 +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
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
Janis Danisevskis
bacb3ebb2a Merge "Keystore 2.0: Remove keystore and keystore2.enable property." 2021-04-07 19:30:12 +00:00
Yo Chiang
7716d479cc Merge "gsi_skip_mount.cfg skips system sub-mountpoints" 2021-04-07 05:04:21 +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
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
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
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
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
910d352ee6 Merge "Revert^2 "Nextgen release: Don't build super_empty.img"" 2021-03-30 06:29:09 +00:00
Ulyana Trafimovich
3140fc9e15 Merge "Disable <uses-library> checks for SDK products." 2021-03-25 10:14:37 +00:00