David Anderson
0095342759
Merge "Move snapuserd into the vendor ramdisk." am: 01585c5ce6
am: f32cb7f738
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1501055
Change-Id: I35a31aba6436fe4c8fa71c063d180e5a129df9ed
2020-11-23 22:19:41 +00:00
David Anderson
01585c5ce6
Merge "Move snapuserd into the vendor ramdisk."
2020-11-23 21:18:07 +00:00
Bo Hu
a5cf995bdc
Merge "emulator: enable cfi for emulator's wifi driver" am: 1816caecf1
am: a084e1bf83
am: e1a86fedc0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1506496
Change-Id: I9cde12bb589f4ef855e5d7aacd8ab606e3182b39
2020-11-20 04:07:29 +00:00
Bo Hu
e1a86fedc0
Merge "emulator: enable cfi for emulator's wifi driver" am: 1816caecf1
am: a084e1bf83
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1506496
Change-Id: Ica00df7f3b8d62470311ce4020f799a52f3dcd80
2020-11-20 03:21:22 +00:00
Treehugger Robot
e4fa02b341
Merge "Use 'inherit-product/inherit-product-if-exists to include config files" am: 3ccf730cdc
am: d6b56ebb57
am: 9be500f3e1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1493738
Change-Id: I6278d2dc2f730dc87cd0e4897c7a333d81a3cb38
2020-11-20 02:29:48 +00:00
Bo Hu
1816caecf1
Merge "emulator: enable cfi for emulator's wifi driver"
2020-11-20 02:17:44 +00:00
Treehugger Robot
9be500f3e1
Merge "Use 'inherit-product/inherit-product-if-exists to include config files" am: 3ccf730cdc
am: d6b56ebb57
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1493738
Change-Id: I2233d95a50a198c014507aed6e57c9d0bb9a71d7
2020-11-20 02:05:22 +00:00
Treehugger Robot
3ccf730cdc
Merge "Use 'inherit-product/inherit-product-if-exists to include config files"
2020-11-19 23:54:27 +00:00
bohu
79106cd3ab
emulator: enable cfi for emulator's wifi driver
...
Since the wpa_supplicant_8 has enabled cfi, the
static lib that it uses should enable cfi, otherwise
there will be runtime crashes.
BUG: 169343095
Test:
lunch sdk_phone_arm64-userdebug
m -j
run the image on the aarch64-linux host
hostapd_nohidl and wpa_supplicant should
not crash with cfi failures.
Change-Id: I00e3840032530ee62aac69cab0b54755f83291f9
2020-11-19 12:50:47 -08:00
David Anderson
8820eaa5e5
Move snapuserd into the vendor ramdisk.
...
For devices that are GKI capable, including virtual_ab_ota_compression
will now include snapuserd in the vendor ramdisk.
For devices that are not GKI-capable (eg do not have vendor_boot),
virtual_ab_ota_compression_retrofit.mk must be included in addition to
virtual_ab_ota_compression.mk. This structure is to avoid needing a
large combination of different Makefiles.
Bug: 173463595
Test: manual test
Change-Id: Idc740d3523c2d166dd578cee41ea07d7eaf8edfa
2020-11-18 22:12:34 -08:00
Treehugger Robot
39a9a9a19f
Merge "Make related stuff for Keymint V1." am: fa91bf2fad
am: d051b1381f
am: a2f30a1d39
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1390756
Change-Id: I9025feac3ead776f748acd400e204efc56374945
2020-11-17 17:33:06 +00:00
Treehugger Robot
a2f30a1d39
Merge "Make related stuff for Keymint V1." am: fa91bf2fad
am: d051b1381f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1390756
Change-Id: Idd08b32d91647cf9651ac4aee7e03b13cca6c22c
2020-11-17 17:10:02 +00:00
Treehugger Robot
fa91bf2fad
Merge "Make related stuff for Keymint V1."
2020-11-17 16:13:50 +00:00
Palmer Dabbelt
890be30837
Merge "Add dmuserd to PRODUCT_PACKAGES_DEBUG" am: 750061ddf8
am: 793516264d
am: 6086d8175f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1482957
Change-Id: I469e1dbe6fd4c2827e4861f961e2c327872787e1
2020-11-17 04:48:18 +00:00
Palmer Dabbelt
6086d8175f
Merge "Add dmuserd to PRODUCT_PACKAGES_DEBUG" am: 750061ddf8
am: 793516264d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1482957
Change-Id: I303b79a4a89c23579bcc646f6c2d3b20032eeb7a
2020-11-17 04:12:26 +00:00
Palmer Dabbelt
750061ddf8
Merge "Add dmuserd to PRODUCT_PACKAGES_DEBUG"
2020-11-17 03:45:50 +00:00
Treehugger Robot
a77dfccb7a
Merge "Add libdmabufheap to VNDK SP list" am: 8e00778fb6
am: 2226b642da
am: 77f953ced5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1496768
Change-Id: Ia081ad756b509ab1133aa175f8ea66fc25c188e5
2020-11-14 02:15:32 +00:00
Treehugger Robot
77f953ced5
Merge "Add libdmabufheap to VNDK SP list" am: 8e00778fb6
am: 2226b642da
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1496768
Change-Id: If83ff25387b6826e6fd5b4f56c9fcd9d950598df
2020-11-14 02:02:07 +00:00
Treehugger Robot
8e00778fb6
Merge "Add libdmabufheap to VNDK SP list"
2020-11-14 01:25:09 +00:00
Hridya Valsaraju
cfd80b3a6e
Add libdmabufheap to VNDK SP list
...
Test: make
Bug: 154310076
Change-Id: I0ec2bce1a6636ac332c7dee370173a727d9d013b
2020-11-11 16:31:31 -08:00
Palmer Dabbelt
2d691edf69
Add dmuserd to PRODUCT_PACKAGES_DEBUG
...
This is a simple dm-user daemon that will be used for the QA tests.
Test: manual, b/171749628
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
Change-Id: I37b78a1479f08f37fe7cff3f2e201dc6d8a6e584
2020-11-10 13:48:02 -08:00
Sasha Smundak
66589d1328
Use 'inherit-product/inherit-product-if-exists to include config files
...
Bug: 172923994
Test: treehugger
Change-Id: I762dfa8dc48c0b09597d2f7b6ef7f53062915a79
2020-11-10 09:59:28 -08:00
David Anderson
015a38a81c
Merge "Add snapuserd to VABC product and base_system.mk." am: 7cd99eb450
am: c0a5fefc1f
am: 498a4291ff
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1464824
Change-Id: I971745c0a7861b1e017ec273d3da8cc188a81443
2020-11-07 03:44:49 +00:00
David Anderson
498a4291ff
Merge "Add snapuserd to VABC product and base_system.mk." am: 7cd99eb450
am: c0a5fefc1f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1464824
Change-Id: Icce918e6ee1ffece1e8515929095e9aaa5a2d83e
2020-11-07 00:28:25 +00:00
David Anderson
7cd99eb450
Merge "Add snapuserd to VABC product and base_system.mk."
2020-11-06 23:26:18 +00:00
Treehugger Robot
cbc7970d10
Merge "Phase out Legacy GSI" am: a0aebc1081
am: e2aef95b2d
am: 2c1648bbc8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1485796
Change-Id: Idbb42bc720a648a2c3a20990ced65b52a3098be4
2020-11-06 05:25:25 +00:00
Treehugger Robot
2c1648bbc8
Merge "Phase out Legacy GSI" am: a0aebc1081
am: e2aef95b2d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1485796
Change-Id: I9aa232d0e9279ed709ac4cede63dedef0d98d692
2020-11-06 04:37:57 +00:00
Treehugger Robot
a0aebc1081
Merge "Phase out Legacy GSI"
2020-11-06 04:00:40 +00:00
Yi Kong
a8d60ab3de
Merge "Add profcollect to PLATFORM_PACKAGES_DEBUG" am: da1cf9f1c1
am: a216a3e2c6
am: 5fcea7ab25
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1485800
Change-Id: I9e8abf5019ccbb944d5d41b3fb672834f0bd9626
2020-11-04 20:05:53 +00:00
Yi Kong
5fcea7ab25
Merge "Add profcollect to PLATFORM_PACKAGES_DEBUG" am: da1cf9f1c1
am: a216a3e2c6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1485800
Change-Id: I2ac90f493820187f3b694a4113faeb5dbcaa9299
2020-11-04 19:53:22 +00:00
Yi Kong
25328f5cb9
Add profcollect to PLATFORM_PACKAGES_DEBUG
...
... but it does not get turned on automatically. This is controlled by
profcollect_native_boot.enabled device config.
Test: boot device and verify profcollectd is disabled by default
Bug: 79161490
Change-Id: Ia91b9759e108896f275633e3156355b65dc94299
2020-11-04 09:44:27 +08:00
Treehugger Robot
ed4bce9aed
Merge "Add keystore2 to PLATFORM_PACKAGES" am: c0f701287c
am: e383447ffe
am: 47767ebd8a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1479457
Change-Id: I6e457563acdc072b3ffda3f66f5a9d87de23c3d8
2020-11-03 21:33:07 +00:00
Treehugger Robot
47767ebd8a
Merge "Add keystore2 to PLATFORM_PACKAGES" am: c0f701287c
am: e383447ffe
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1479457
Change-Id: I6fac0ea9a1815b005e0735844b7100043099a975
2020-11-03 21:20:30 +00:00
SzuWei Lin
d418471390
Phase out Legacy GSI
...
Legacy GSI is the GSI for the O/O-MR1 launching devices. VINTF and
VNDK do not support O/O-MR1 now. It is the time to phase out Legacy
GSI.
Bug: 162277261
Test: none
Change-Id: I55901604da21daa58b51ee6676cd61bb9e4ff5e6
2020-11-03 18:23:57 +08:00
Janis Danisevskis
95799b056e
Add keystore2 to PLATFORM_PACKAGES
...
Add keystore 2 to the PLATFORM_PACKAGES in anticipation for the Keystore
2.0 migration. This builds and installs keystore2 on the device, but it
does not get started yet. Staring keystore2 is currently controlled with
the platform property ro.android.security.keystore2.enable=true.
Bug: 171305684
Test: keystore2 builds and is present on the device but does not start
unconditionally.
Change-Id: Id92cb2aa38022516067853d89d6c3210db1100a8
2020-10-28 19:40:51 -07:00
Treehugger Robot
1645d4075a
Merge "Add fs_config_(dirs|files) for product and system_ext" am: 1391c95f32
am: 324a3729d6
am: 75f2758912
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1465965
Change-Id: Ie4d3da25cb9cb49507b439412a1cb564bcb27914
2020-10-22 07:54:04 +00:00
Treehugger Robot
75f2758912
Merge "Add fs_config_(dirs|files) for product and system_ext" am: 1391c95f32
am: 324a3729d6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1465965
Change-Id: Ia39fe375a6b3cc1898d1cc5132862b095062cd57
2020-10-22 07:25:20 +00:00
Justin Yun
75f7cf9a2d
Add fs_config_(dirs|files) for product and system_ext
...
These files were added to devices with the fs_config_files_nonsystem
module in base_vendor.mk. As they are partition-specific, move them
to each base_<partition>.mk file.
To add the fs_config_* files to the base_<partition>.mk files, it is
required to define the fs_config_* regardless of the existance of
partitions.
Bug: 170282998
Test: build and check if they are installed.
Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-21 03:39:22 +00:00
Steven Moreland
0189ce2216
Merge "Update VNDK version for common graphics HALs." into rvc-d1-dev-plus-aosp am: a4995363e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12874991
Change-Id: I141c489cf5dee08a76300c2eedf4e481b3d89c49
2020-10-20 20:42:33 +00:00
Steven Moreland
be4cdda31b
Update VNDK version for common graphics HALs.
...
We are adding things to them, and in order for core libraries like libui
to use them, the newer versions need to be in the VNDK.
Exempt-From-Owner-Approval: cherry-pick
Bug: 170435409
Test: build
Change-Id: I18495d303ae8bd68f35631b2be2dc9dcf915e991
Merged-In: I18495d303ae8bd68f35631b2be2dc9dcf915e991
2020-10-20 00:23:17 +00:00
Steven Moreland
40a9f49ced
Update VNDK version for common graphics HALs.
...
We are adding things to them, and in order for core libraries like libui
to use them, the newer versions need to be in the VNDK.
Bug: 170435409
Test: build
Change-Id: I18495d303ae8bd68f35631b2be2dc9dcf915e991
Merged-In: I18495d303ae8bd68f35631b2be2dc9dcf915e991
2020-10-19 21:04:21 +00:00
David Anderson
607800d615
Add snapuserd to VABC product and base_system.mk.
...
Bug: 168259959
Test: builds
Change-Id: I289f84e293c84b12f5f33f8940643bac43ff5d35
2020-10-16 15:07:52 -07:00
Makoto Onuki
4c9a4c8d5e
Merge "Remove unneed jar files from the system partition" am: e1faea86f9
am: 282b6fce49
am: 6be865dc5c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1462688
Change-Id: I762f7f3c6171bb7bebff37d1c1c7d4cdc68e75ec
2020-10-16 16:57:50 +00:00
Makoto Onuki
6be865dc5c
Merge "Remove unneed jar files from the system partition" am: e1faea86f9
am: 282b6fce49
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1462688
Change-Id: I8f0cf8db250d9fa955858c4214bddde69d8841cd
2020-10-16 16:29:01 +00:00
Makoto Onuki
e1faea86f9
Merge "Remove unneed jar files from the system partition"
2020-10-16 15:41:16 +00:00
Makoto Onuki
90ac5ae188
Remove unneed jar files from the system partition
...
Fix: 170967644
Test: boot
Test: Make sure the following jar files are removed
$OUT/system/framework/service-blobstore.jar
$OUT/system/framework/service-jobscheduler.jar
Change-Id: Ia5351d9d3b1dda7bf96e95bbaad171cd8c3b49fc
Merged-in: Ia5351d9d3b1dda7bf96e95bbaad171cd8c3b49fc
2020-10-15 13:06:58 -07:00
Martin Stjernholm
39b05f8c78
Merge "Rename com.android.art module." am: a530fa9825
am: 8125de9276
am: 56348da7f9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1455023
Change-Id: If98ec37c768b4d58dc204c99847656c2ed54cd27
2020-10-14 18:44:47 +00:00
Martin Stjernholm
56348da7f9
Merge "Rename com.android.art module." am: a530fa9825
am: 8125de9276
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1455023
Change-Id: I5455bb3c63c0fb11b8903ab1bd594f8044b4a4ef
2020-10-14 18:29:46 +00:00
Martin Stjernholm
a530fa9825
Merge "Rename com.android.art module."
2020-10-14 17:56:42 +00:00
Devin Moore
acd2e14225
Merge "Update vndk list for android.hardware.common.fmq" am: 761f5fe164
am: 2b37bd991e
am: 757b419fde
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1456139
Change-Id: I3079933f30fafb5c0e87a452acec4cb04fe00018
2020-10-13 15:50:33 +00:00