Commit Graph

7505 Commits

Author SHA1 Message Date
Sarah Chin
a4b4d7a8a7 Merge "Add Radio AIDL to VNDK" into stage-aosp-master am: d0a58e8d6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15749448

Change-Id: Id31822c3fb98504d653969e6670c82e8b943a4b3
2021-09-09 04:40:51 +00:00
Sarah Chin
d0a58e8d6e Merge "Add Radio AIDL to VNDK" into stage-aosp-master 2021-09-09 04:25:24 +00:00
Sarah Chin
c68e0808ae Add Radio AIDL to VNDK
Test: build
Bug: 198331182
Change-Id: I95d089fb23c4a3baa7f7a6c1435099f34a1af5a3
Merged-In: I95d089fb23c4a3baa7f7a6c1435099f34a1af5a3
2021-09-08 19:09:08 +00:00
Treehugger Robot
3622de339a Merge "Disable the delete_all_keys feature for GSI" am: 2215f2cbae am: 441a92cc5c
Original change: https://android-review.googlesource.com/c/platform/build/+/1821093

Change-Id: Iff38ddfc94e709ed318c6a016d8eba04ca10e1d4
2021-09-08 08:26:32 +00:00
Treehugger Robot
441a92cc5c Merge "Disable the delete_all_keys feature for GSI" am: 2215f2cbae
Original change: https://android-review.googlesource.com/c/platform/build/+/1821093

Change-Id: I091f21c0b238e772e53fca06fa41dc6d74c42e9a
2021-09-08 08:13:43 +00:00
Howard Chen
994e4a54f4 Disable the delete_all_keys feature for GSI
Bug: 197914756
Test: run GSI with DSU on a Pixel device

Change-Id: I78ee95f99764bee71bf3bcccb992ee35fa80603b
2021-09-08 13:18:10 +08:00
Linzhao Ye
d268d9c545 Merge "Add Wifi HostApd AIDL interface support." am: cfa99e3596 am: ca4211dd02
Original change: https://android-review.googlesource.com/c/platform/build/+/1794735

Change-Id: I709354b69af62931cb202cacdf8ff2983280e4e2
2021-09-07 17:53:54 +00:00
Linzhao Ye
ca4211dd02 Merge "Add Wifi HostApd AIDL interface support." am: cfa99e3596
Original change: https://android-review.googlesource.com/c/platform/build/+/1794735

Change-Id: Ie39b75d484698a4e402129204f18cf928c933924
2021-09-07 17:35:53 +00:00
Yi-Yo Chiang
33fc244de5 Roll-forward the VNDK snapshot list of GSI
The latest stable SDK version is 31, so add 31 to the list of VNDK
snapshots.

Bug: 196806844
Test: Presubmit
Change-Id: Ia9aab527d9c1fe1d1eb6c72ebc184a3fccad6a22
2021-08-17 08:52:43 +00:00
Chris Ye
8d0fb2d4f5 Add Wifi HostApd AIDL interface support.
Test: Manual test.
Bug: 194806512

Change-Id: I11d9d559262178de66772df0d7f70c084a397a4d
2021-08-14 05:17:51 +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
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
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
2ede665af0 Merge "Drop pinner.pin_camera=false from the default prop." 2021-08-05 15:59:22 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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