Commit Graph

7903 Commits

Author SHA1 Message Date
SzuWei Lin
67155335e1 Merge "Move init.vndk-*.rc to system_ext/etc/gsi" 2021-07-30 13:57:06 +00:00
Mathew Inwood
541f745316 Add libincident. am: e24af74376 am: e344cb5b29
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15411834

Change-Id: I7a23f9e37a8541dde2891b01113376fa7e4fab85
2021-07-30 10:59:49 +00:00
Mathew Inwood
65e6a0d3f9 Add libincident. am: e24af74376
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15411834

Change-Id: I43a5b3ba570bd32049b2e15e67e9ead0846843ba
2021-07-30 10:42:59 +00:00
SzuWei Lin
f36ea80ea3 Move init.vndk-*.rc to system_ext/etc/gsi
Orgianlly, init.vndk-*.rc are placed under system_ext/etc/init.
`init` always run all thse .rc files. The patch move these .rc
files to system_ext/etc/gsi to avoid the problem.

Bug: 185457479
Test: build gsi_arm64-userdebug; check the files under system_ext/
Change-Id: Iee67d6e2e872cf3cb1dd1014925ed0249c1e7e2d
2021-07-30 17:33:50 +08:00
Hajime Morrita
ea331d6bcc Drop pinner.pin_camera=false from the default prop.
The pin_camera flag being false makes some in-market devices
(redfin, bramble, coral, etc.) not pin the camera app by default.
Although a Phenotype flag overrides this value,
the OTA flag delivery can fail and ends up non-ping state.

This change makes sure that the device pins the camera app by default
by removing pinner.pin_camera properties modification from this file.
The current default is to pin the camera. See PinnerServices.java

Note that the camera pinning is still disabled on crosshatch family,
sicne it is known to be prone to the memory shortage.
See device-crosshatch.mk.

Also note that some newer devices already pin by default because
they don't refer this file, although the name implies it might.

Test: On Redfin:
  $ vendor/google/tools/flashall -w
  $ adb root && adb wait-for-device && adb shell am start -a com.android.setupwizard.FOUR_CORNER_EXIT
  $ adb shell dumpsys pinner
Bug: 195035033
Bug: 184897981
Change-Id: I81207d0527f758d4800319a3a3c323919daaf814
2021-07-29 15:46:27 -07:00
Mathew Inwood
e24af74376 Add libincident.
This library is required by the StatsD apex and including it here ensures
it's always available for use by the apex.

Bug: 192556458
Bug: 160662406
Test: TH
Change-Id: Ia01964d471e4456c05c77c708dee2e71e0121587
2021-07-29 14:59:29 +00:00
satayev
a85d5225ee Rename PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to PRODUCT_APEX_SYSTEM_SERVER_JARS.
Regardless of an "updatable" property, list all apex jars in the same
variable. This is less confusing for devs and matches the pattern with
PRODUCT_APEX_BOOT_JARS.

Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I3b12f26237636f4271cb000480928b3ce1c2e62f
Merged-In: I3b12f26237636f4271cb000480928b3ce1c2e62f
2021-07-27 16:09:52 +00:00
satayev
fa21749ffd Rename PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to PRODUCT_APEX_SYSTEM_SERVER_JARS.
Regardless of an "updatable" property, list all apex jars in the same
variable. This is less confusing for devs and matches the pattern with
PRODUCT_APEX_BOOT_JARS.

Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I3b12f26237636f4271cb000480928b3ce1c2e62f
Merged-In: I3b12f26237636f4271cb000480928b3ce1c2e62f
2021-07-27 16:55:10 +01:00
Devarshi Bhatt
829778c435 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference


BUG=162536543

Change-Id: I898ab6d972e3dd3dce64cf5fdbb4a2698c2c29e3
2021-07-27 13:16:10 +00:00
satayev
009a105ba0 Rename PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to PRODUCT_APEX_SYSTEM_SERVER_JARS.
Regardless of an "updatable" property, list all apex jars in the same
variable. This is less confusing for devs and matches the pattern with
PRODUCT_APEX_BOOT_JARS.

Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I3b12f26237636f4271cb000480928b3ce1c2e62f
2021-07-27 13:41:32 +01:00
Colin Cross
47d36a96ad Fix build
Test: m out/target/product/bramble/obj/PACKAGING/vndk_intermediates/check-list-timestamp
Merged-In: I5745e9deb6eb6786fe4084a5b8e92925b70a8551
Change-Id: I5745e9deb6eb6786fe4084a5b8e92925b70a8551
(cherry picked from commit 980089dab4)
(cherry picked from commit ee3ddc7159)
2021-07-26 11:25:24 +09:00
Jiyong Park
d502a48dc4 Reland: *-ndk.so libraries are added to the VNDK set.
We will replace the ndk_platform backend with the ndk backend. The
former hasn't been deleted yet because there already are references to
it. When the existing references are all replaced with the ndk backend,
we will remove the ndk_platform backend and the corresponding libraries
will be removed from this list.

Bug: 161456198
Test: m
Merged-In: I4c45fdfd64159370813c40c8fa5554744b630746
Change-Id: I4c45fdfd64159370813c40c8fa5554744b630746
(cherry picked from commit ebe0e06055)
2021-07-26 11:25:04 +09:00
Colin Cross
ee3ddc7159 Fix build
Test: m out/target/product/bramble/obj/PACKAGING/vndk_intermediates/check-list-timestamp
Merged-In: I5745e9deb6eb6786fe4084a5b8e92925b70a8551
Change-Id: I5745e9deb6eb6786fe4084a5b8e92925b70a8551
(cherry picked from commit 980089dab4)
2021-07-26 09:28:44 +09:00
Jiyong Park
fa50d58e0a Reland: *-ndk.so libraries are added to the VNDK set.
We will replace the ndk_platform backend with the ndk backend. The
former hasn't been deleted yet because there already are references to
it. When the existing references are all replaced with the ndk backend,
we will remove the ndk_platform backend and the corresponding libraries
will be removed from this list.

Bug: 161456198
Test: m
Merged-In: I4c45fdfd64159370813c40c8fa5554744b630746
Change-Id: I4c45fdfd64159370813c40c8fa5554744b630746
(cherry picked from commit ebe0e06055)
2021-07-26 09:28:31 +09:00
Colin Cross
980089dab4 Fix build
Test: m out/target/product/bramble/obj/PACKAGING/vndk_intermediates/check-list-timestamp
Change-Id: I5745e9deb6eb6786fe4084a5b8e92925b70a8551
2021-07-23 14:56:59 -07:00
Kalesh Singh
ca472cdf6c Merge "vndk-list: Add android.system.suspend-V1-ndk_platform.so" am: d29f7d5466 am: 0af82868c6
Original change: https://android-review.googlesource.com/c/platform/build/+/1772438

Change-Id: I261deca8f5c67095aa74a95e28060b57d52af880
2021-07-23 21:25:40 +00:00
Kalesh Singh
40fe95d1c1 vndk-list: Add android.system.suspend-V1-ndk_platform.so
Bug: 170260236
Test: m
Change-Id: Ibebad08a196504da32d733213226de78a30f0cd1
(cherry picked from commit 43014449a5)
2021-07-23 14:18:33 -07:00
Kalesh Singh
d29f7d5466 Merge "vndk-list: Add android.system.suspend-V1-ndk_platform.so" 2021-07-23 17:16:28 +00:00
Bowgo Tsai
008599f7e9 Sets BOOT_SECURITY_PATCH for the generic boot.img
This is for GKI 1.0 devices to pass VtsHalKeymasterV4_0TargetTest.

For GKI 2.0 devices, they will use device-specific
BOOT_SECURITY_PATCH to sign a prebuilt GKI boot.img to
override this value.
See https://r.android.com//1711437 for details.

Bug: 192513934
Test: `lunch gsi_arm64-user` then `make bootimage`
Test: `avbtool info_image --image $OUT/boot-4.19-gz.img`, checks
      com.android.build.boot.security_patch exists
Change-Id: I3909cccd0eae7c142d3c01d0ecb2c249286b9ebe
Merged-In: I3909cccd0eae7c142d3c01d0ecb2c249286b9ebe
(cherry picked from commit 81a23fed56)
2021-07-23 11:48:26 +08:00
Treehugger Robot
ef997441af Merge "Sets BOOT_SECURITY_PATCH for the generic boot.img" am: 94bd6d7d5b am: e4348ac729 am: 0d3f6e6f11 am: f77eef88dd
Original change: https://android-review.googlesource.com/c/platform/build/+/1773887

Change-Id: I451ffc990058931d4ef3d4ae4a2b1887b8cacfea
2021-07-23 03:06:29 +00:00
Treehugger Robot
0d3f6e6f11 Merge "Sets BOOT_SECURITY_PATCH for the generic boot.img" am: 94bd6d7d5b am: e4348ac729
Original change: https://android-review.googlesource.com/c/platform/build/+/1773887

Change-Id: I25c2482ce5b9e62d72bf2182d36ec12368acf00d
2021-07-23 02:20:11 +00:00
Treehugger Robot
94bd6d7d5b Merge "Sets BOOT_SECURITY_PATCH for the generic boot.img" 2021-07-23 01:41:31 +00:00
Bowgo Tsai
81a23fed56 Sets BOOT_SECURITY_PATCH for the generic boot.img
This is for GKI 1.0 devices to pass VtsHalKeymasterV4_0TargetTest.

For GKI 2.0 devices, they will use device-specific
BOOT_SECURITY_PATCH to sign a prebuilt GKI boot.img to
override this value.
See https://r.android.com//1711437 for details.

Bug: 192513934
Test: `lunch gsi_arm64-user` then `make bootimage`
Test: `avbtool info_image --image $OUT/boot-4.19-gz.img`, checks
      com.android.build.boot.security_patch exists
Change-Id: I3909cccd0eae7c142d3c01d0ecb2c249286b9ebe
2021-07-22 16:09:05 +08:00
Jiyong Park
ebe0e06055 Reland: *-ndk.so libraries are added to the VNDK set.
We will replace the ndk_platform backend with the ndk backend. The
former hasn't been deleted yet because there already are references to
it. When the existing references are all replaced with the ndk backend,
we will remove the ndk_platform backend and the corresponding libraries
will be removed from this list.

Bug: 161456198
Test: m
Change-Id: I4c45fdfd64159370813c40c8fa5554744b630746
2021-07-21 15:58:52 +00:00
Kalesh Singh
43014449a5 vndk-list: Add android.system.suspend-V1-ndk_platform.so
Bug: 170260236
Test: m
Change-Id: Ibebad08a196504da32d733213226de78a30f0cd1
2021-07-20 23:31:05 +00:00
satayev
2d34aa8515 Rename PRODUCT_UPDATABLE_BOOT_JARS to PRODUCT_APEX_BOOT_JARS. am: 11079b3d3f am: 74b4b945f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15337298

Change-Id: I5e5b65871d9015471c60f64d05bb41d16c36e3a8
2021-07-20 20:10:10 +00:00
satayev
11079b3d3f Rename PRODUCT_UPDATABLE_BOOT_JARS to PRODUCT_APEX_BOOT_JARS.
Regardless of an "updatable" property of individual, list all apex boot
jars in the same variable. This is less confusing for devs, especially
since they shouldn't care about things like boot images.

Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I0a559db462d1e1f67003ac54d1e27a89110d802a
2021-07-20 16:48:13 +00:00
satayev
65e68bb263 Rename PRODUCT_UPDATABLE_BOOT_JARS to PRODUCT_APEX_BOOT_JARS.
Regardless of an "updatable" property of individual, list all apex boot
jars in the same variable. This is less confusing for devs, especially
since they shouldn't care about things like boot images.

Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I0a559db462d1e1f67003ac54d1e27a89110d802a
Merged-In: I0a559db462d1e1f67003ac54d1e27a89110d802a
2021-07-20 15:46:53 +01:00
Martijn Coenen
421172ec00 Merge "Revert "*-ndk.so libraries are added to the VNDK set."" 2021-07-19 10:10:18 +00:00
Martijn Coenen
0ee4b09e20 Revert "*-ndk.so libraries are added to the VNDK set."
Revert "Add more target-specific properties"

Revert submission 15310714-remove_ndk_platform

Reason for revert: b/193935495
Reverted Changes:
Ia87b2881e:NDK backends supports both apps and platform
Ia32d82d6e:*-ndk.so libraries are added to the VNDK set.
Ie54b512a6:Add more target-specific properties

Change-Id: I16f1894d7c37fff1c89c9cc168f84fd6054ace31
2021-07-19 08:08:53 +00:00
Treehugger Robot
e95be4c110 Merge "Move core-icu4j to PRODUCT_UPDATABLE_BOOT_JARS." am: bcb4776446 am: 73588ab86d am: e5f0b9f66e am: 6935853710
Original change: https://android-review.googlesource.com/c/platform/build/+/1736332

Change-Id: Ifbbfd7df57c2401616d7e3af4113d9e5ca33b78f
2021-07-16 18:34:02 +00:00
Treehugger Robot
e5f0b9f66e Merge "Move core-icu4j to PRODUCT_UPDATABLE_BOOT_JARS." am: bcb4776446 am: 73588ab86d
Original change: https://android-review.googlesource.com/c/platform/build/+/1736332

Change-Id: I903241f6a8186a2470b032b994583968aa1731eb
2021-07-16 17:55:24 +00:00
satayev
09e9471eac Move core-icu4j to PRODUCT_UPDATABLE_BOOT_JARS.
... but not really: move it back to PRODUCT_BOOT_JARS before the list is
passed to soong. This ensures that core-icu4j remains on the boot image
for system health reasons and maintains the status quo.

core-icu4j is the only APEX jar (aside from ART jars) that is ever meant
to be part of the boot image. This is an implementation detail that most
devs don't and shouldn't care about. Instead, most devs assume that
PRODUCT_UPDATABLE_BOOT_JARS is where all apex jars are meant to go. In
the follow ups, PRODUCT_UPDATABLE_BOOT_JARS would be renamed to
PRODUCT_APEX_BOOT_JARS, regardless of the updatable property.

This also solves the problem where vendors add /system and /system_ext
boot jars to PRODUCT_BOOT_JARS outside of default_art_config.mk and
essentially violate the ordering requirement: all /apex jars come after
/system and /system_ext.

Bug: 191127295
Test: atest CtsClasspathsTestCases derive_classpath_test
Change-Id: Ifdfdd02519a0f5baea45619523f0c1eb8be186bc
2021-07-16 14:50:29 +01:00
Jiyong Park
559c53dc1c *-ndk.so libraries are added to the VNDK set.
We will replace the ndk_platform backend with the ndk backend. The
former hasn't been deleted yet because there already are references to
it. When the existing references are all replaced with the ndk backend,
we will remove the ndk_platform backend and the corresponding libraries
will be removed from this list.

Bug: 161456198
Test: m

Change-Id: Ia32d82d6e32c367bdf1f92151c7da7408e8bcbfa
2021-07-16 22:32:34 +09:00
Treehugger Robot
c36df83b7c Merge "Including debug ramdisk files in base_vendor.mk" am: 187a693129 am: fc0a872d68 am: 1451019f92 am: bb4fa1292a
Original change: https://android-review.googlesource.com/c/platform/build/+/1765532

Change-Id: Iee17be67d0fbb0db8b0f12b3851560c5cddddd75
2021-07-15 09:51:29 +00:00
Treehugger Robot
1451019f92 Merge "Including debug ramdisk files in base_vendor.mk" am: 187a693129 am: fc0a872d68
Original change: https://android-review.googlesource.com/c/platform/build/+/1765532

Change-Id: I303c342605ed94c58c93939c4845f03d0fe6c321
2021-07-15 09:29:40 +00:00
Brett Chabot
c8dbfb795f Port sdk_slim_x86_64 from rvc-emu-dev.
This 'slim' target produces a system image optimized for
headless automated testing on the emulator.

Bug: 193713572
Test: lunch sdk_slim_x86_64, m -j, atest CtsUtilTestCases
Change-Id: I599bfab49b574bef63e5bb90a2aa19c86d566293
2021-07-14 23:25:06 +00:00
Bowgo Tsai
7472a1e6f9 Including debug ramdisk files in base_vendor.mk
Debug ramdisk files should exist for all devices.
Adding those debug ramdisk files in the base_vendor.mk.

  * https://source.android.com/compatibility/vts/vts-on-gsi

Bug: 193565271
Test: `lunch aosp_flame-userdebug`, `make bootimage_debug` then
      checks the output under $OUT/debug_ramdisk/.
Test: Performs the same check for `lunch aosp_bramble-userdebug`.
Change-Id: Id32a53da9a3d5b17ffd05449669c6aa17aec0dfa
2021-07-14 16:50:07 +08:00
TreeHugger Robot
69f66460de Merge "Delete com.android.cronet from base_system" into sc-dev 2021-07-02 09:03:40 +00:00
Treehugger Robot
85806ec38f Merge "Adding adb_debug.prop into generic_ramdisk.mk" am: fb36e13147 am: abc9064f63 am: a39c362271 am: 4ffdd026e1
Original change: https://android-review.googlesource.com/c/platform/build/+/1752361

Change-Id: I01770c4832940460308a17f5d6407d04fde7cf90
2021-07-01 13:46:43 +00:00
Treehugger Robot
a39c362271 Merge "Adding adb_debug.prop into generic_ramdisk.mk" am: fb36e13147 am: abc9064f63
Original change: https://android-review.googlesource.com/c/platform/build/+/1752361

Change-Id: I38494dd7233128148deb631eaa4bad0a0239a7b9
2021-07-01 13:18:56 +00:00
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
TreeHugger Robot
744d6629d2 Merge "Include kernel-*-allsyms into boot-*-allsyms.img" into sc-dev 2021-06-30 17:16:25 +00:00
Neil Fuller
81240dae1a Merge "Remove com.android.geotz jar from system server" into sc-dev am: 59b80b91a4 am: 27dacbc582 am: 8e72cc3604
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14112924

Change-Id: I2b33f908042dde7a9858455613271de7aaa81fdc
2021-06-30 11:39:04 +00:00
Neil Fuller
8e72cc3604 Merge "Remove com.android.geotz jar from system server" into sc-dev am: 59b80b91a4 am: 27dacbc582
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14112924

Change-Id: I17e20b07d4afbf840d7360ccd29864f4107efab8
2021-06-30 11:22:09 +00:00
Neil Fuller
98a2c38a40 Merge "Remove com.android.geotz jar from system server" into sc-dev am: 59b80b91a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14112924

Change-Id: I460600631dbfecf51534b454143dfe1aa6c4fdbf
2021-06-30 11:07:02 +00:00
Neil Fuller
59b80b91a4 Merge "Remove com.android.geotz jar from system server" into sc-dev 2021-06-30 10:54:44 +00:00
Treehugger Robot
1871e7e06b Merge "Include kernel-*-allsyms into boot-*-allsyms.img" am: 0427fb4a97 am: 807d80a6e7 am: 86866377f7 am: 0b80ac3833
Original change: https://android-review.googlesource.com/c/platform/build/+/1749896

Change-Id: Id79aefbc79082ddce10a40323ecbee3d06cfa4eb
2021-06-30 09:46:38 +00:00
Treehugger Robot
86866377f7 Merge "Include kernel-*-allsyms into boot-*-allsyms.img" am: 0427fb4a97 am: 807d80a6e7
Original change: https://android-review.googlesource.com/c/platform/build/+/1749896

Change-Id: I5da0d0c23060d5f6a0fcfbfe3fe60e1af73084da
2021-06-30 09:17:59 +00:00
Treehugger Robot
0427fb4a97 Merge "Include kernel-*-allsyms into boot-*-allsyms.img" 2021-06-30 08:49:08 +00:00