Commit graph

5139 commits

Author SHA1 Message Date
Jiyong Park
b00931e7eb ro.zygote in base_system.mk is optional
The setting of ro.zygote in base_system.mk is optional, which means the
value can be overriden by other (probably more specific) mk files.

Bug: 117892318
Bug: 158735147
Test: atest --host post_process_prop_unittest

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: Ia7a67c0a04fad343d6591417f40dd4b9ddadc5e4
(cherry picked from commit b1261aac33)
Change-Id: Ia7a67c0a04fad343d6591417f40dd4b9ddadc5e4
2020-06-30 14:28:04 +09:00
Jooyung Han
8f4bc20787 Merge "GSI: install flattened cts shim" into rvc-dev am: cd1aaed4f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11910091

Change-Id: I1c7e6b2f3f3e6645e475a8ebb8dc17b3da423895
2020-06-22 17:20:52 +00:00
Jooyung Han
cd1aaed4f0 Merge "GSI: install flattened cts shim" into rvc-dev 2020-06-22 17:05:58 +00:00
Jooyung Han
15f9085595 GSI: install flattened cts shim
The flattened version of com.android.apex.cts.shim.v1 should be
explicitly installed because the shim apex is prebuilt one and
PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES is not supported for
prebuilt_apex modules yet.

Bug: 158169437
Bug: 159392784
Test: m com.android.apex.cts.shim.v1_with_prebuilts.flattened
      # should install the prebuilts of shim APKs
Change-Id: I8b37a320d2130d7b33aca856bc067dce37d1fb30
2020-06-19 20:09:06 +09:00
TreeHugger Robot
7fe2cf07aa Merge "iorap: Turn off pinner by default for large memory devices." into rvc-dev am: b8f8fc6a88
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11923072

Change-Id: Ib79da635eda60f3290402cb47d79600737c12d2a
2020-06-19 03:41:56 +00:00
yawanng
77107a17e5 iorap: Turn off pinner by default for large memory devices.
Bug: 157667363
Test: Make
Change-Id: I980a470596da3bf4e500bbd6c517e1a022c2d1a0
2020-06-19 00:47:17 +00:00
TreeHugger Robot
aec1debc65 Merge "Skip mount /oem on GSI" into rvc-dev 2020-06-18 15:32:41 +00:00
Jing-yan, Jang
a46fd29698 Merge "Identity: Add credstore" into rvc-dev am: dd592d87ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11736599

Change-Id: I6154f915c8ddb457fcbbf4cb8acdafe89b1dab16
2020-06-18 06:54:01 +00:00
Jing-yan, Jang
dd592d87ec Merge "Identity: Add credstore" into rvc-dev 2020-06-18 06:47:03 +00:00
TreeHugger Robot
588cb3cc06 Merge "Remove ANGLE from base_system.mk" into rvc-dev am: ddca499c5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11897778

Change-Id: Ibb6f34cc37ea3b6bc269b8a73073807f0d02f0ae
2020-06-17 21:01:59 +00:00
Tim Van Patten
25db69a401 Remove ANGLE from base_system.mk
Removing GoogleANGLE only removed the Google-signed version of ANGLE,
but the AOSP version still remained. This CL removes the AOSP build of
ANGLE also, so there is no ANGLE on the device at all.

Bug: 158956138
Test: adb shell pm list packages | grep -i angle
Change-Id: If9a42bc6436c752d2b1a16565d99ca2a5ec60d66
2020-06-17 12:38:25 -06:00
SzuWei Lin
03a29a6974 Skip mount /oem on GSI
GSI self contains the full Android system part. Skip mounting
the oem partition on GSI, which is a part of system.

Bug: 158433698
Test: build aosp_arm64-userdebug.
Test: Check the file /system/system_ext/etc/init/config/skip_mount.cfg
Change-Id: I689e1cc8a68b980d68b1d6ef1d715203db078dc2
Merged-In: I689e1cc8a68b980d68b1d6ef1d715203db078dc2
(cherry picked from commit f8475cc49f)
2020-06-17 18:18:20 +08:00
Treehugger Robot
7e0ddb1e59 Merge "Skip mount /oem on GSI" am: 03db4fbbb7 am: f775227f30
Original change: https://android-review.googlesource.com/c/platform/build/+/1331103

Change-Id: Id7dcfff53ea7635ffc142b37fe25dfdc408c82c1
2020-06-17 08:55:48 +00:00
Treehugger Robot
03db4fbbb7 Merge "Skip mount /oem on GSI" 2020-06-17 08:21:23 +00:00
josephjang
f829b2bc9f Identity: Add credstore
In order to support mDL on RVC, we need to
add credstore in /system/bin

Bug: 136506289
Test: atest VtsHalIdentityTargetTest
Change-Id: I7975eddde5b94edcd3a2d0e213244f84ffe43e8d
2020-06-16 14:04:00 +00:00
Jiyong Park
cd0c931b89 Merge "Organize product vars for adding properties" 2020-06-15 10:00:22 +00:00
Colin Cross
a1383d8f9d Use inclusive language in build/make
Bug: 158889297
Test: m checkbuild
Change-Id: I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28
Merged-In: I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28
(cherry picked from commit c3ad80467e)
2020-06-12 21:10:55 -07:00
Colin Cross
8fae3c8472 resolve merge conflicts of 4cbab13de1 to rvc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I12bbaf25876357f564829044b672f042240b2acf
2020-06-12 17:46:50 -07:00
SzuWei Lin
f8475cc49f Skip mount /oem on GSI
GSI self contains the full Android system part. Skip mounting
the oem partition on GSI, which is a part of system.

Bug: 158433698
Test: build aosp_arm64-userdebug.
Test: Check the file /system/system_ext/etc/init/config/skip_mount.cfg
Change-Id: I689e1cc8a68b980d68b1d6ef1d715203db078dc2
2020-06-12 16:25:44 +08:00
Treehugger Robot
2158d2ec6b Merge "Use inclusive language in build/make" 2020-06-12 03:19:02 +00:00
Yo Chiang
d0935e46f5 Merge "Remove default GSI libnfc-nci.conf" am: 2294009766 am: b1f03ab796
Original change: https://android-review.googlesource.com/c/platform/build/+/1322636

Change-Id: I0c7a1a306edb314e52bf3c50cfd6727b97889d04
2020-06-12 03:11:30 +00:00
Yo Chiang
2294009766 Merge "Remove default GSI libnfc-nci.conf" 2020-06-12 02:37:45 +00:00
TreeHugger Robot
d43c8c83bc Merge "iorap: Move the pinner property to product/build.prop" into rvc-dev am: 0ffb2a8265
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11791946

Change-Id: I203152b9d944247f5c30ec8a3d3800fa5cdddda1
2020-06-11 22:50:59 +00:00
TreeHugger Robot
0ffb2a8265 Merge "iorap: Move the pinner property to product/build.prop" into rvc-dev 2020-06-11 22:31:22 +00:00
Colin Cross
c3ad80467e Use inclusive language in build/make
Test: m checkbuild
Change-Id: I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28
2020-06-11 14:37:54 -07:00
Jiyong Park
eb49b34b1e Organize product vars for adding properties
Properties for <partition>/build.prop are now added via
PRODUCT_<PARTITION>_PROPERTIES.

PRODUCT_SYSTEM_PROPERTIES is added. PRODUCT_SYSTEM_DEFAULT_PROPERTIES
will be deprecated.

PRODUCT_VENDOR_PROPERTIES is added. PRODUCT_PROPERTY_OVERRIDES and
PRODUCT_DEFAULT_PROPERTY_OVERRIDES will be deprecated in favor of the new
variable.

For other partitions (odm, system_ext, product), there is no change.

Exempt-From-Owner-Approval: cherry-pick from internal master

Bug: 117892318
Test: m
Merged-In: I98f3b5d0da661b3ad75260a23754e655103b7a44
(cherry picked from commit ad810b6dae)
Change-Id: I98f3b5d0da661b3ad75260a23754e655103b7a44
2020-06-11 15:35:23 +09:00
Jiyong Park
1ea01c5b24 Organize product vars for adding properties
Properties for <partition>/build.prop are now added via
PRODUCT_<PARTITION>_PROPERTIES.

PRODUCT_SYSTEM_PROPERTIES is added. PRODUCT_SYSTEM_DEFAULT_PROPERTIES
will be deprecated.

PRODUCT_VENDOR_PROPERTIES is added. PRODUCT_PROPERTY_OVERRIDES and
PRODUCT_DEFAULT_PROPERTY_OVERRIDES will be deprecated in favor of the new
variable.

For other partitions (odm, system_ext, product), there is no change.

Exempt-From-Owner-Approval: cherry-pick from master

Bug: 117892318
Test: m
Merged-In: I98f3b5d0da661b3ad75260a23754e655103b7a44
(cherry picked from commit ad810b6dae)
Change-Id: I98f3b5d0da661b3ad75260a23754e655103b7a44
2020-06-11 15:13:41 +09:00
Elliott Hughes
71e9c32390 Merge "Remove TARGET_PREFER_32_BIT." am: 9df45f6ec2 am: 534b035e29
Original change: https://android-review.googlesource.com/c/platform/build/+/1288989

Change-Id: Ib72e06fd5b674606403bee352d3ddbd93d7430c7
2020-06-10 18:36:54 +00:00
yawanng
74800141bf iorap: Move the pinner property to product/build.prop
/system/build.prop must not be device-specific, it's for all Android targets.
The pinner.pin_camera=true is device-specific, so move it to /product/build.prop.

Bug: 158366075
Test: Make
Change-Id: Ie5cd37e09fe1d589ea619e6bb5edf807211d047f
2020-06-09 16:43:01 +00:00
TreeHugger Robot
7a726856a9 Merge "Use APK CtsShim prebuilts for flattened apex." into rvc-dev 2020-06-09 11:14:45 +00:00
Elliott Hughes
9b824d5ceb Remove TARGET_PREFER_32_BIT.
Bug: https://issuetracker.google.com/138812821
Test: builds
Change-Id: I2ff7793c8b1eb56f6be63375cc7b70aa44254443
2020-06-08 16:36:52 -07:00
Dario Freni
581be147c7 Use APK CtsShim prebuilts for flattened apex.
Fix: 158036322
Test: built flame-userdebug with m OVERRIDE_TARGET_FLATTEN_APEX=true, ran
atest CtsAppSecurityHostTestCases:android.appsecurity.cts.PrivilegedUpdateTests#testDisableUpdatedSystemApp
and verified that the cts shim apex is not installed

Change-Id: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
Merged-In: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
(cherry picked from commit c9a786e5f77a5c06da6c07f718e4a7619a75d9e6)
2020-06-08 21:49:57 +00:00
Josh Gao
0336f08679 Merge "Rename adbd_system_binaries to adbd_system_api." am: 581e1f4f1f am: 821ecd2b56
Original change: https://android-review.googlesource.com/c/platform/build/+/1322454

Change-Id: I0838c25e56d9d71186162c5d3518a2a857bfdd96
2020-06-08 21:31:28 +00:00
Josh Gao
76e974567c Rename adbd_system_binaries to adbd_system_api.
This is going to include libraries as well, so rename to reflect this.

Bug: http://b/157709367
Test: treehugger
Change-Id: I94625a6343e18032d8607cf8c58bde49d64db85c
(cherry picked from commit 67e0295833)
2020-06-08 14:07:02 -07:00
Josh Gao
581e1f4f1f Merge "Rename adbd_system_binaries to adbd_system_api." 2020-06-08 21:00:19 +00:00
Dario Freni
b586dba65a Use APK CtsShim prebuilts for flattened apex.
Fix: 158036322
Test: built flame-userdebug with m OVERRIDE_TARGET_FLATTEN_APEX=true, ran
atest CtsAppSecurityHostTestCases:android.appsecurity.cts.PrivilegedUpdateTests#testDisableUpdatedSystemApp
and verified that the cts shim apex is not installed

Change-Id: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
Merged-In: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
(cherry picked from commit c9a786e5f77a5c06da6c07f718e4a7619a75d9e6)
2020-06-08 18:44:52 +00:00
Yo Chiang
dcfa601374 Remove default GSI libnfc-nci.conf
libnfc-nci.so provides a default config at /system/etc/libnfc-nci.conf.
Remove /system/etc/libnfc-nci.conf PRODUCT_COPY_FILES entries from
aosp_product.mk and board/generic/device.mk.

Bug: 157704723
Test: Build gsi. /system/etc/libnfc-nci.conf is installed.
Test: Flash gsi. Check logcat and NFC still works.
Test: Toggle NFC on/off and /etc/libnfc-nci.conf is loaded.
Test: Build aosp_bonito. Both /(system|product)/etc/libnfc-nci.conf are
  installed.
Test: Flash aosp_bonito. Check logcat and NFC still works.
Test: Toggle NFC on/off and /product/etc/libnfc-nci.conf is loaded.
Change-Id: Id119a88a10b549e1fd475cf9b14b18410923011b
2020-06-08 11:56:10 +00:00
Treehugger Robot
150dcadc6b Merge "remove clatd.conf which is no longer required by clat daemon" am: 5638065faa am: 0208ce535d
Original change: https://android-review.googlesource.com/c/platform/build/+/1172552

Change-Id: I7ff19c2525236946f868f7fa21144a8f026af22b
2020-06-03 05:41:32 +00:00
Treehugger Robot
5638065faa Merge "remove clatd.conf which is no longer required by clat daemon" 2020-06-03 05:15:21 +00:00
Yo Chiang
f0ae2c5aab Merge "Revert^2 "Retire mainline.mk"" am: 2ca90c5e97 am: eb4f43e6cc
Original change: https://android-review.googlesource.com/c/platform/build/+/1322634

Change-Id: I09d8227ecb91c6a36c45ad6459089708398b4aa2
2020-06-03 03:14:57 +00:00
Yo Chiang
2ca90c5e97 Merge "Revert^2 "Retire mainline.mk"" 2020-06-03 02:47:52 +00:00
Yo Chiang
82e4bc5d0c Revert^2 "Retire mainline.mk"
This reverts commit 4003bd9def.

Reason for revert: cleaned up mainline.mk users

Bug: 157548597
Fixes: 141443017
Change-Id: I5e38620ed1c90f7188901eb148c7e3aa0596a27d
2020-06-03 02:47:34 +00:00
Maciej Żenczykowski
836cbf2943 remove clatd.conf which is no longer required by clat daemon
Test: builds
Bug: 144730808
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: If5d9e575c0c784fe121d8aff533354d3c91ecff4
2020-06-02 10:32:45 +00:00
Josh Gao
67e0295833 Rename adbd_system_binaries to adbd_system_api.
This is going to include libraries as well, so rename to reflect this.

Bug: http://b/157709367
Test: treehugger
Change-Id: I94625a6343e18032d8607cf8c58bde49d64db85c
2020-06-01 18:57:25 -07:00
TreeHugger Robot
0c6b790cd0 Merge "iorap: Add a config mk for large memory device." into rvc-dev am: 270308af15
Change-Id: Iea1f4698d48db34bd37983927d3f576e0b0926a4
2020-05-29 21:39:50 +00:00
TreeHugger Robot
270308af15 Merge "iorap: Add a config mk for large memory device." into rvc-dev 2020-05-29 21:27:26 +00:00
David Zeuthen
ea366764bb Merge "Update Identity Credential AIDL and Keymaster AIDL to V2 in VNDK list" into rvc-dev am: c599a2708f
Change-Id: I0a4443d9bbcf8ad81c5cd8e4a075e2a1e57b8651
2020-05-28 23:36:09 +00:00
Yan Wang
ef60ddcf6a iorap: Add a config mk for large memory device.
Pinner for camera is turned on for large memory.

Bug: 157667363
Test: Make
Change-Id: I86be79f59fa5b569fbd4e68402d3ea1b9b62275f
2020-05-28 22:50:52 +00:00
David Zeuthen
c599a2708f Merge "Update Identity Credential AIDL and Keymaster AIDL to V2 in VNDK list" into rvc-dev 2020-05-28 22:04:19 +00:00
TreeHugger Robot
03ba879155 Merge "Add extra VNDK v30 to GSI" into rvc-dev-plus-aosp 2020-05-28 02:39:31 +00:00