Commit Graph

8527 Commits

Author SHA1 Message Date
Roshan Pius
a4c0bc61a8 Merge "Add uwb apex/jars to top level makefiles" 2021-08-11 16:14:54 +00:00
Treehugger Robot
8d277634e8 Merge "Add servicedispatcher to PRODUCT_PACKAGES_DEBUG." am: 5a28a2af48 am: 9d15040d13 am: ed35e2f153 am: 93cb762f11 am: 57bc0bdf2b
Original change: https://android-review.googlesource.com/c/platform/build/+/1727691

Change-Id: I3d4810516978fbe3b0fa59d820a3ff1ac94337a2
2021-08-11 05:03:20 +00:00
Treehugger Robot
ed35e2f153 Merge "Add servicedispatcher to PRODUCT_PACKAGES_DEBUG." am: 5a28a2af48 am: 9d15040d13
Original change: https://android-review.googlesource.com/c/platform/build/+/1727691

Change-Id: Ib1260dc4b90a17802f2c421cba5284e36bb545cf
2021-08-11 04:21:59 +00:00
Treehugger Robot
5a28a2af48 Merge "Add servicedispatcher to PRODUCT_PACKAGES_DEBUG." 2021-08-11 03:52:56 +00:00
Roshan Pius
4ae4381fcc Add uwb apex/jars to top level makefiles
Bug: 194906542
Test: Compiles
Change-Id: I214f9487fd8cb5da4df24b32d3378fb083b79281
2021-08-10 11:35:12 -07:00
Devarshi Bhatt
e2ae18aa2d Merge "Update language to comply with Android's inclusive language guidance" am: 4cc80241d3 am: 78e21c833f am: 0834ae0821 am: c132acebcc am: 3bcfb0b563
Original change: https://android-review.googlesource.com/c/platform/build/+/1776205

Change-Id: I0c79cd86b5e18ea6fbcca6ff5a71c724ce18a3e4
2021-08-10 13:17:02 +00:00
Devarshi Bhatt
0834ae0821 Merge "Update language to comply with Android's inclusive language guidance" am: 4cc80241d3 am: 78e21c833f
Original change: https://android-review.googlesource.com/c/platform/build/+/1776205

Change-Id: Icbd56462efcb1354fd297987b6198d0eaa5321ba
2021-08-10 12:45:22 +00:00
Devarshi Bhatt
4cc80241d3 Merge "Update language to comply with Android's inclusive language guidance" 2021-08-10 12:20:30 +00:00
Roshan Pius
88920a431f Add uwb HAL ndk to gsi
Bug: 195308730
Test: Compiles
Change-Id: I43911c9a8e37dde278fe4616fbb5142ab2218b2a
2021-08-09 21:59:06 -07:00
Kelvin Zhang
75fe035bf7 Merge "Add a build prop for go/vabc-xor" am: f0d9c940e4 am: 30f7435240 am: 3500d1d14c am: d107aafa7a am: 632d92cbfe
Original change: https://android-review.googlesource.com/c/platform/build/+/1778325

Change-Id: Ic4247b336e2ff275cf13d608d4ebb891fc7d9d95
2021-08-09 16:14:34 +00:00
Kelvin Zhang
3500d1d14c Merge "Add a build prop for go/vabc-xor" am: f0d9c940e4 am: 30f7435240
Original change: https://android-review.googlesource.com/c/platform/build/+/1778325

Change-Id: I96b83d35b7a6892c757f68091e12b01d637fc430
2021-08-09 15:30:40 +00:00
Kelvin Zhang
bcda23488c Add a build prop for go/vabc-xor
Allow each lunch target to control if they want to use this new feature.

Test: th
Change-Id: I10219a916bca258e669de051262f9ebba8434803
2021-08-06 11:51:41 -04:00
Hajime Morrita
ff3051aeb2 Remove iorap_large_memory_config.mk
Test: Presubmit
Bug: 195415601
Change-Id: I374a2743cbc7dc128becb9c8d59eb007c910070a
2021-08-05 13:09:36 -07:00
Hajime Morrita
2ede665af0 Merge "Drop pinner.pin_camera=false from the default prop." 2021-08-05 15:59:22 +00:00
SzuWei Lin
77124f3ba2 Merge "Always build modules in GSI from source" am: 32ccb49665 am: 744607679e am: 211b689721 am: bc48fd6b94
Original change: https://android-review.googlesource.com/c/platform/build/+/1787688

Change-Id: I37b34037626347c38b185374e7bd67cbefe49594
2021-08-05 12:27:53 +00:00
SzuWei Lin
211b689721 Merge "Always build modules in GSI from source" am: 32ccb49665 am: 744607679e
Original change: https://android-review.googlesource.com/c/platform/build/+/1787688

Change-Id: Ic9757343d652a8263cb8d71f9bdd8b41a55bae7a
2021-08-05 11:55:28 +00:00
SzuWei Lin
bff4b52ce1 Always build modules in GSI from source
GSI includes both flattened and unflattened apex at the same time.
However, a flattend apex is not built if the module is built from
prebuilt binary. So, we enable 'MODULE_BUILD_FROM_SOURCE := true'
to force GSI built all modules from source.

Bug: 194917545
Test: build gsi_gms_arm64-user
Test: check com.google.android.art exists in /system/system_ext/apex/
Change-Id: I89eef3e8d06ec1f9d3245513c2dbbff0777e2c62
Merged-In: I89eef3e8d06ec1f9d3245513c2dbbff0777e2c62
2021-08-05 09:47:38 +00:00
SzuWei Lin
8c63356702 Always build modules in GSI from source
GSI includes both flattened and unflattened apex at the same time.
However, a flattend apex is not built if the module is built from
prebuilt binary. So, we enable 'MODULE_BUILD_FROM_SOURCE := true'
to force GSI built all modules from source.

Bug: 194917545
Test: build gsi_gms_arm64-user
Test: check com.google.android.art exists in /system/system_ext/apex/
Change-Id: I89eef3e8d06ec1f9d3245513c2dbbff0777e2c62
2021-08-05 08:51:54 +00:00
Hajime Morrita
baecb72884 Merge "Drop pinner.pin_camera=false from the default prop." into sc-dev am: 44c73a61d1 am: aed340f2e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15422361

Change-Id: Idac423c0dfc9b412596ff5f0549f475130ed9219
2021-08-04 19:07:51 +00:00
Hajime Morrita
1210b6efa8 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
Merged-In: I81207d0527f758d4800319a3a3c323919daaf814
Change-Id: I81207d0527f758d4800319a3a3c323919daaf814
2021-08-04 12:06:50 -07:00
Hajime Morrita
3f152cd5a7 Merge "Drop pinner.pin_camera=false from the default prop." into sc-dev am: 44c73a61d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15422361

Change-Id: I48d9842a444cc3609237e88266596ad1b927600c
2021-08-04 18:51:23 +00:00
Hajime Morrita
44c73a61d1 Merge "Drop pinner.pin_camera=false from the default prop." into sc-dev 2021-08-04 18:11:14 +00:00
SzuWei Lin
dd1eb4f6c7 Merge "Move init.vndk-*.rc to system_ext/etc/gsi" am: 67155335e1 am: 22a5147f63 am: b8f532635d am: 305b48464e
Original change: https://android-review.googlesource.com/c/platform/build/+/1782514

Change-Id: Ie1c8f14cfb5e2a91a0519e41bcd9d62d2fec4ea2
2021-07-30 15:02:26 +00:00
SzuWei Lin
b8f532635d Merge "Move init.vndk-*.rc to system_ext/etc/gsi" am: 67155335e1 am: 22a5147f63
Original change: https://android-review.googlesource.com/c/platform/build/+/1782514

Change-Id: Ie6d3035b54d52116c65cde0923c75108e07fcf2a
2021-07-30 14:33:11 +00:00
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