Commit graph

5209 commits

Author SHA1 Message Date
Jiyong Park
ad810b6dae 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.

Bug: 117892318
Test: m
Change-Id: I98f3b5d0da661b3ad75260a23754e655103b7a44
2020-06-09 22:52:56 +09:00
Josh Gao
e1e0135aad Merge "Rename adbd_system_binaries to adbd_system_api." am: 581e1f4f1f am: 821ecd2b56 am: 0336f08679 am: 2dcaca7c3a am: 570df23fac
Original change: https://android-review.googlesource.com/c/platform/build/+/1322454

Change-Id: Ifa31e514661c6d83b71ec8ee3b1be73441099165
2020-06-08 22:21:01 +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
581e1f4f1f Merge "Rename adbd_system_binaries to adbd_system_api." 2020-06-08 21:00:19 +00:00
Dario Freni
e23fd86f1b 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
2020-06-08 15:14:01 +00:00
Treehugger Robot
7cd19b8188 Merge "remove clatd.conf which is no longer required by clat daemon" am: 5638065faa am: 0208ce535d am: 150dcadc6b am: f06cae8d9d am: 7fe6c10873
Original change: https://android-review.googlesource.com/c/platform/build/+/1172552

Change-Id: I5bd3417939cac9c9e7270db69a505a0d793b04eb
2020-06-03 06:21:20 +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
e7d0b87efc Merge "Revert^2 "Retire mainline.mk"" am: 2ca90c5e97 am: eb4f43e6cc am: f0ae2c5aab am: f9043118c1 am: 0031a883ec
Original change: https://android-review.googlesource.com/c/platform/build/+/1322634

Change-Id: Ia0e0fdfa63e945e5432c4ad46e22e7db6ddbd77d
2020-06-03 03:58:25 +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
42d662a75b Merge "iorap: Add a config mk for large memory device." into rvc-dev am: 270308af15 am: 1e020580e2 am: 117823fe43 am: 19516d1c9d
Change-Id: Icf0fc5cf88467cdb238f11a1c73bc70da1e1009b
2020-05-29 22:25:16 +00:00
TreeHugger Robot
19516d1c9d Merge "iorap: Add a config mk for large memory device." into rvc-dev am: 270308af15 am: 1e020580e2 am: 117823fe43
Change-Id: I366419e37399c47a891c4b1a3e3be25db0b57eaa
2020-05-29 22:06:30 +00: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
4db6bf344d Merge "Update Identity Credential AIDL and Keymaster AIDL to V2 in VNDK list" into rvc-dev am: c599a2708f am: b27a8278e4 am: 1a5c205100 am: 9714112ffb
Change-Id: Ie046b5fba344aea717ef0ed970f8684bff4a53f6
2020-05-29 00:19:59 +00:00
David Zeuthen
9714112ffb Merge "Update Identity Credential AIDL and Keymaster AIDL to V2 in VNDK list" into rvc-dev am: c599a2708f am: b27a8278e4 am: 1a5c205100
Change-Id: Iebaa3d80cddf167ac8cd64230b3b8983ea5c2375
2020-05-29 00:04:31 +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
cd3084a9dd Merge "Add extra VNDK v30 to GSI" into rvc-dev-plus-aosp am: 03ba879155 am: c0b5ca7d98 am: c0c1d75f83
Change-Id: Iab17a4cd002848065c3cf87d6a41a20e08c6b884
2020-05-28 03:23: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
Luke Huang
428d5d0406 Merge "Revert "DO NOT MERGE: Delete com.android.cronet from base_system. am: 8640960329"" into rvc-dev-plus-aosp 2020-05-28 02:34:40 +00:00
Chen Xu
15458b9d49 Merge "support data migration by default" into rvc-dev am: 18029ed3d2
Change-Id: Ib4525526ef6390d319a8294aaab0328551e1f1ff
2020-05-28 01:06:38 +00:00
Chen Xu
18029ed3d2 Merge "support data migration by default" into rvc-dev 2020-05-28 00:24:29 +00:00
Chen Xu
9dfa9ec4ae support data migration by default
include stub cellbroadcat app for data preservation by dafault.

Bug: 155844209
Change-Id: I34d1978ce89f4d4edbf327a3b61f7fb87262aae0
Merged-in: I34d1978ce89f4d4edbf327a3b61f7fb87262aae0
2020-05-27 16:15:48 +00:00
Chen Xu
6f35dd8d3e Merge "support data migration by default" 2020-05-27 16:13:34 +00:00
Chen Xu
71caa217f5 support data migration by default
include stub cellbroadcat app for data preservation by dafault.

Bug: 155844209
Change-Id: I34d1978ce89f4d4edbf327a3b61f7fb87262aae0
2020-05-27 16:11:41 +00:00
Beverly Tai
a1cf0709f7 Merge "Revert "Retire mainline.mk"" am: 7943056adc am: 39b8113e2c am: 99da2d2bc6 am: 991e441126 am: 6a66f638ec
Change-Id: Iff607770db0850c7323248376b71d111ae7d95ac
2020-05-27 15:04:25 +00:00
Beverly Tai
99da2d2bc6 Merge "Revert "Retire mainline.mk"" am: 7943056adc am: 39b8113e2c
Change-Id: I7787ab7f82da9e317ada146861e43a531104a59f
2020-05-27 14:27:46 +00:00
Beverly Tai
7943056adc Merge "Revert "Retire mainline.mk"" 2020-05-27 14:02:57 +00:00
Beverly Tai
4003bd9def Revert "Retire mainline.mk"
This reverts commit 60c0064902.

Reason for revert: build breakages

Change-Id: Ie8304d1979c50578901efed77fb31281c336505c
Fixes: 157548597
2020-05-27 13:28:22 +00:00
Treehugger Robot
b1becb827c Merge "Create emulator_* devices for emulators" am: 6a00738ed8 am: d5ec97ea5b am: 617b6b0e06 am: 5a66ab91c4 am: 8abda991de
Change-Id: I650258eb5962b1029e3c46340f1004dd07bf019d
2020-05-27 12:27:10 +00:00
Treehugger Robot
617b6b0e06 Merge "Create emulator_* devices for emulators" am: 6a00738ed8 am: d5ec97ea5b
Change-Id: I93692595bbed7cea81b1bda8567eb551f844e2c8
2020-05-27 11:55:31 +00:00
Treehugger Robot
56eaa8dba3 Merge "Retire mainline.mk" am: 8ecc4d5710 am: bafaa5b25e am: 3904663650 am: 842ddf8672 am: 734b480ba4
Change-Id: I29de60ae95a2d88d168487ca577dd1571ef60c8d
2020-05-27 11:42:39 +00:00
Treehugger Robot
6a00738ed8 Merge "Create emulator_* devices for emulators" 2020-05-27 11:27:58 +00:00
Treehugger Robot
3904663650 Merge "Retire mainline.mk" am: 8ecc4d5710 am: bafaa5b25e
Change-Id: I89d17d49b8dfb000fa24caaa45c7a928230bb9c4
2020-05-27 10:58:15 +00:00
Treehugger Robot
8ecc4d5710 Merge "Retire mainline.mk" 2020-05-27 10:31:28 +00:00
SzuWei Lin
68945a07a7 Add extra VNDK v30 to GSI
Bug: 154768946
Bug: 154672908
Test: build aosp_arm64-userdebug
Test: check system/system_ext/apex/com.android.vndk.v30
Change-Id: I2b32e28b973da0a3aeab0b10a542c64e3fec3273
2020-05-27 08:50:57 +00:00
SzuWei Lin
c73db784b9 Create emulator_* devices for emulators
aosp_arm64 has no emulators after the patch:

https://android-review.googlesource.com/c/platform/build/+/1286895

The patch creates all other emulator_* devices by cloning from
generic_*, and modify all sdk_phone_* to use them.

Bug: 111538404
Test: build sdk_phone_armv7-userdebug
Test: build sdk_phone_x86_64-userdebug
Test: build sdk_phone_x86-userdebug
Change-Id: I2b82e999ea919f005729f322cd948e6b72ba6843
2020-05-27 16:41:44 +08:00
Howard Chen
ef70bb9dc9 Merge "Add tinyhostless to mainline_system.mk" am: c0ea7e89b8 am: 67a7b6d830 am: 64b6535f43 am: 449d8a5e1f am: 039d60a548
Change-Id: I31de0cf147340f6fa601937d2643e7269094a4b8
2020-05-27 03:54:01 +00:00
Howard Chen
64b6535f43 Merge "Add tinyhostless to mainline_system.mk" am: c0ea7e89b8 am: 67a7b6d830
Change-Id: I3c37fbd4de8aa2e00918430fca0e154cb83330d5
2020-05-27 03:00:47 +00:00
Howard Chen
c0ea7e89b8 Merge "Add tinyhostless to mainline_system.mk" 2020-05-27 02:41:37 +00:00
Yo Chiang
60c0064902 Retire mainline.mk
We've converted all known users of mainline.mk to use
mainline_system.mk. Don't include mainline.mk directly in the future,
instead include mainline_system.mk and other partition specific
makefiles. Remove mainline.mk to prevent people from accidentally
including it again.

Bug: 141443017
Test: TH
Change-Id: Id161f29951982a100482a6201130adeebdb49846
2020-05-27 02:29:02 +00:00
Yo Chiang
e32703d3be Merge "Remove mainline_arm64.mk" 2020-05-27 02:26:26 +00:00
Treehugger Robot
b09bc6c34c Merge "Fix type error" am: fdc392b245 am: de33c9c26e am: 53d445153c am: 27bd3743cd am: 207f80de32
Change-Id: I198fd30d0b96781eb07b5276f518dcf59f2176c7
2020-05-26 21:28:56 +00:00
Treehugger Robot
53d445153c Merge "Fix type error" am: fdc392b245 am: de33c9c26e
Change-Id: If349c8fae1437893e4b58dab2ebe41aeebeecc8d
2020-05-26 20:13:50 +00:00