Commit graph

5309 commits

Author SHA1 Message Date
Yifan Hong
e51c7e8aef Set allow list for generic ramdisk
Devices that uses generic ramdisk must inherit from generic_ramdisk.mk.
This makefile ensures that only a set of files can be installed to the
ramdisk. Other files must be installed to the vendor-ramdisk.

Let aosp_arm64 use this makefile.

Fixes: 173742069
Test: manual
Change-Id: Ib2a4a208deaf2f4d707bec256207b4b8479a601a
(cherry picked from commit bc9608c4c3f3cd0ac3f29863209c80fcfe4e2f7f)
2020-12-09 16:31:25 +00:00
SzuWei Lin
9faf469d27 Move ro.zygote to vendor
The system property ro.zygote should be define in vendor. It went
to system wrongly when replacing PRODUCT_DEFAULT_PROPERTY_OVERRIDES.

Bug: 173452246
Test: build a Pixel device and check build.prop under system and vendor
Change-Id: I86919f993ae44f3502eb63e728d33acaa14f7088
2020-12-09 07:11:37 +00:00
Christian Wailes
4af080d7d7 Merge "Added new compiler filter properties for dexopt." am: e42b9ceb81
Original change: https://android-review.googlesource.com/c/platform/build/+/1479801

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4adf3e98b8ee18683339247537433239e33e2046
2020-12-09 01:22:52 +00:00
Chris Wailes
edbbf82586 Added new compiler filter properties for dexopt.
Bug: 173137187
Test: build
Merged-In: Ie413f5f0bcf5f691135530caee9111a496788ef8
Change-Id: Ie413f5f0bcf5f691135530caee9111a496788ef8
2020-12-07 16:15:55 -08:00
Kalesh Singh
343a6e9cf5 Add stable aidl memtrack hal to vndk list
Bug: 175021432
Test: m; boot;
Change-Id: Iac54ae2ba8aacee7fa9c5b1c8b49ff1cfd7c8785
2020-12-07 13:00:02 -05:00
SzuWei Lin
1b0f9bff9c Move ro.zygote to vendor
The system property ro.zygote should be define in vendor. It went
to system wrongly when replacing PRODUCT_DEFAULT_PROPERTY_OVERRIDES.

Bug: 173452246
Test: build a Pixel device and check build.prop under system and vendor
Change-Id: I86919f993ae44f3502eb63e728d33acaa14f7088
Merged-In: I86919f993ae44f3502eb63e728d33acaa14f7088
2020-12-07 08:05:27 +00:00
Yifan Hong
a3237f249c Merge "Add linker to VAB with vendor_ramdisk" am: 69ba9af617
Original change: https://android-review.googlesource.com/c/platform/build/+/1515823

Change-Id: I080a319718999524d1d6420570c0408b4613c785
2020-12-03 20:14:59 +00:00
Yifan Hong
914ef21c28 Add linker to VAB with vendor_ramdisk
Add linker.vendor_ramdisk for Virtual A/B devices with
a vendor_ramdisk because e2fsck is dynamic.

Test: pass
Bug: 173425293
Change-Id: I0a6f5bf15362e28eaa07a4d639ea23749b94b0f5
2020-12-02 19:51:16 -08:00
Yifan Hong
90dd8696d4 Merge "Add Virtual A/B with vendor ramdisk product." am: 08d1865332
Original change: https://android-review.googlesource.com/c/platform/build/+/1506505

Change-Id: If927d3717936c4eaa382ceb691f780a9f7e3f2c1
2020-12-03 03:46:54 +00:00
Yifan Hong
08d1865332 Merge "Add Virtual A/B with vendor ramdisk product." 2020-12-03 03:02:35 +00:00
Xin Li
4bc4ff3c11 Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855
Bug: 172690556
Merged-In: I880b5dfb7bfea4b6abef9fcb603abcb383d84f42
Change-Id: I3c3385a1c58004f1ee6124de0c86dfff614a3bf6
2020-12-02 00:03:31 -08:00
Anton Hansson
8c73673e73 Add bootclasspath config to its own makefile
This is part of adding some devices/products suitable for unbundled
builds. An unbundled product does not need all the PRODUCT_PACKAGES
etc present in the normal hierarchy of products, but does need to know
which jars are on the bootclasspath.

Therefore, factor out the bootclasspath config from base_system.mk and
put it in its own makefile where it can be inherited by these unbundled
products.

Bug: 172256440
Test: diff presubmit artifacts (noop)
Merged-In: Id3f91e387bba2e0525b4010f22fe380d1d8be537
Change-Id: Id3f91e387bba2e0525b4010f22fe380d1d8be537
2020-11-25 18:53:37 +00:00
Yifan Hong
6b7cc73ec5 Add Virtual A/B with vendor ramdisk product.
If vendor_ramdisk exists, it is preferred to use launch_with_vendor_ramdisk.mk
because it moves e2fsck to vendor_ramdisk, making ramdisk smaller.

Devices that uses VABC is assumed to have a vendor ramdisk, so inherit
from this new makefile.

Test: pass
Change-Id: If6adad9985ca4750225fd4263edb42de1ddaf486
2020-11-23 15:17:01 -08:00
Yifan Hong
942987d116 Add symlinks to legacy Virtual A/B makefiles.
For Virtual A/B makefiles that is created before S, add
symlinks so that existing devices don't break.

Test: pass
Change-Id: Ie04c4a8a2375edc673a8a7a2adcd162b21178f68
2020-11-23 15:17:01 -08:00
Yifan Hong
018c698280 Move virtual_ab makefiles to its own dir.
Also add a readme file.

Test: none

Change-Id: Ia1e02d8fb0c6df13271f208b3ca1dc1f250b085b
2020-11-23 15:17:01 -08:00
David Anderson
01585c5ce6 Merge "Move snapuserd into the vendor ramdisk." 2020-11-23 21:18:07 +00:00
Bo Hu
1816caecf1 Merge "emulator: enable cfi for emulator's wifi driver" 2020-11-20 02:17:44 +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
fa91bf2fad Merge "Make related stuff for Keymint V1." 2020-11-17 16:13:50 +00:00
Palmer Dabbelt
750061ddf8 Merge "Add dmuserd to PRODUCT_PACKAGES_DEBUG" 2020-11-17 03:45:50 +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
7cd99eb450 Merge "Add snapuserd to VABC product and base_system.mk." 2020-11-06 23:26:18 +00:00
Treehugger Robot
a0aebc1081 Merge "Phase out Legacy GSI" 2020-11-06 04:00:40 +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
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
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
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
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
a530fa9825 Merge "Rename com.android.art module." 2020-10-14 17:56:42 +00:00
Martin Stjernholm
1cced44791 Rename com.android.art module.
Paving the way for renaming the ART release APEX to com.android.art.

Test: m
Bug: 169639321
Change-Id: I55af4b3dcba48757e7fb65d5d4bc7517c91ae80f
2020-10-13 14:37:19 +01:00
Devin Moore
68a3cef45e Update vndk list for android.hardware.common.fmq
Change created with update-vndk-list.sh for the new package.

Test: m
Bug: 142326204
Change-Id: Iecd2ad2fc2f00c0214dc3ad4bf60661b492c5e4f
2020-10-09 13:48:01 -07:00
Treehugger Robot
09da8b1ba1 Merge "Include selinux_policy_* for product and system_ext." 2020-10-08 00:49:44 +00:00
Treehugger Robot
c50ba5554a Merge "Add android.system.keystore2-V1-ndk_platform.so to gsi/current.txt" 2020-10-07 20:45:52 +00:00
Justin Yun
599330f865 Include selinux_policy_* for product and system_ext.
After separating selinux_policy_system_ext and selinux_policy_product
from the selinux_policy_nonsystem module, add them to
base_system_ext.mk and base_product.mk, respectively.

Bug: 170282998
Test: build and check boot
Change-Id: I03a4ae435898dd773f418d37f321ad0a37f17c3e
2020-10-07 18:16:45 +09:00
Colin Cross
988ca5f04e Merge "Manually install hwasan runtime on SANITIZE_TARGET=hwaddress builds" am: 3ed9b8b7f9 am: 9d560baab5 am: 2afae90d46 am: 5ff38b8498
Original change: https://android-review.googlesource.com/c/platform/build/+/1437493

Change-Id: I61af4fa7d12de65ad1f8fa056a297f40b61b63ff
2020-10-02 02:41:11 +00:00
Colin Cross
2afae90d46 Merge "Manually install hwasan runtime on SANITIZE_TARGET=hwaddress builds" am: 3ed9b8b7f9 am: 9d560baab5
Original change: https://android-review.googlesource.com/c/platform/build/+/1437493

Change-Id: I9d408d5e0b04788f05663d86aa11e1f8c5c844a4
2020-10-02 01:52:47 +00:00
Colin Cross
3ed9b8b7f9 Merge "Manually install hwasan runtime on SANITIZE_TARGET=hwaddress builds" 2020-10-02 01:06:10 +00:00
Mathieu Chartier
802767b583 Merge "Do not set ro.iorapd.enable=true" am: 62ae5b55fe am: f96088c1da am: 49f48872ff am: b6d672978c
Original change: https://android-review.googlesource.com/c/platform/build/+/1440211

Change-Id: I6b7c729635db5be80a3651d0d82939d46b697b6c
2020-09-30 23:31:26 +00:00
Mathieu Chartier
49f48872ff Merge "Do not set ro.iorapd.enable=true" am: 62ae5b55fe am: f96088c1da
Original change: https://android-review.googlesource.com/c/platform/build/+/1440211

Change-Id: Ia800db8a9383727205e4f533911e7649fb158118
2020-09-30 22:32:15 +00:00
Janis Danisevskis
3cc7647af1 Add android.system.keystore2-V1-ndk_platform.so to gsi/current.txt
Change-Id: Icd9644e468a29d5ca47291faaaa9f5ca3fc4902c
2020-09-29 07:09:45 -07:00
Wang Han
4a4a4df0af Do not set ro.iorapd.enable=true
* This is true by default, this is redundant.

Change-Id: I936d701c8b644ea4667bf855a71448c8d7a1448a
2020-09-27 13:11:18 +00:00
Colin Cross
eb013b236e Manually install hwasan runtime on SANITIZE_TARGET=hwaddress builds
Due to bugs in Soong around prebuilt libraries with stubs versions,
the hwasan runtime was installed into /system/lib64/bootstrap, but the
module was not given a ".bootstrap" suffix.  Once the bugs are fixed,
the hwasan runtime is no longer installed because the dependencies
on "libclang_rt.hwasan-aarch64-android" are now on an uninstallable
stubs library.  Add libclang_rt.hwasan-aarch64-android.bootstrap
to PRODUCT_PACKAGES when SANITIZE_TARGET=hwaddress is set.

Test: m checkbuild
Change-Id: I732d37505274c7bf804396921202f2bcca4484ec
2020-09-24 12:47:50 -07:00
David Anderson
4b51c8cb06 Merge "Add virtual A/B compression product." am: 1fdef5f75a am: e5d2e92c5b am: ab87f94acb am: ad4a29aff5
Original change: https://android-review.googlesource.com/c/platform/build/+/1426180

Change-Id: I05a3f290f6147a99b2bb4752066230290edc7a8f
2020-09-24 00:39:09 +00:00
David Anderson
ab87f94acb Merge "Add virtual A/B compression product." am: 1fdef5f75a am: e5d2e92c5b
Original change: https://android-review.googlesource.com/c/platform/build/+/1426180

Change-Id: I2d34d2c8c5ad9b61e0497de0e6c675f81ebfd307
2020-09-23 23:30:22 +00:00
David Anderson
1fdef5f75a Merge "Add virtual A/B compression product." 2020-09-23 22:19:15 +00:00
Anton Hansson
3fc285a21a Merge "Remove SafetyRegulatoryInfo from generic system" 2020-09-22 08:52:22 +00:00
Wilson Sung
45f7514a42 Cleanup legacy project code am: b251795103
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12524922

Change-Id: I7cc8cebfbe90b7cedc7b03d5127c2f20e07b0194
2020-09-22 08:25:06 +00:00
Anton Hansson
863a944b5f Merge "Remove SafetyRegulatoryInfo from generic system" into rvc-dev-plus-aosp am: 0721499720 am: 532f6e453e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12628152

Change-Id: I6fca40dc6e325cf8a756e277f0fea35b432c8288
2020-09-22 08:23:39 +00:00
Yanting Yang
e109340cfa Remove SafetyRegulatoryInfo from generic system
SafetyRegulatoryInfo should not exist in AOSP.

Fixes: 166139891
Test: make && flash to verify regulatory option of Settings
Merged-In: I5fbef719ba30cdbf37e0d4c6daa06a50c06e9495
Change-Id: I5fbef719ba30cdbf37e0d4c6daa06a50c06e9495
2020-09-22 08:34:52 +01:00
Anton Hansson
0721499720 Merge "Remove SafetyRegulatoryInfo from generic system" into rvc-dev-plus-aosp 2020-09-22 07:34:24 +00:00
Wilson Sung
b251795103 Cleanup legacy project code
Bug: 155898698
Change-Id: Ie9c417893b988718019d7efa3461aeb431319443
Signed-off-by: Wilson Sung <wilsonsung@google.com>
2020-09-22 07:30:45 +00:00
Treehugger Robot
48af4f6529 Merge "Add an aosp target that supports 64-bit app only" am: f5941dae52 am: 9ad9398223
Original change: https://android-review.googlesource.com/c/platform/build/+/1430099

Change-Id: I25160e7bb6fe65e2cd674bfe2304679abd3f39bc
2020-09-21 18:21:42 +00:00
Tim Van Patten
1c18908d4f Merge "Add ANGLE.apk to the base system" am: 54f87c12e9 am: 9c5f12cab9 am: ca3069049b am: 0f6c3bfdfd
Original change: https://android-review.googlesource.com/c/platform/build/+/1431045

Change-Id: I6e88d98dcad291f632b60d995aad96cd3de13c60
2020-09-21 18:20:16 +00:00
Treehugger Robot
f5941dae52 Merge "Add an aosp target that supports 64-bit app only" 2020-09-21 17:48:36 +00:00
Sam Lin
7c9f562d00 Add an aosp target that supports 64-bit app only
Bug: 168796046
Test: N/A
Change-Id: I57116fe67cbe1322f348c9d0506655f32a900dcc
Merged-In: I57116fe67cbe1322f348c9d0506655f32a900dcc
2020-09-21 17:44:46 +00:00
Tim Van Patten
ca3069049b Merge "Add ANGLE.apk to the base system" am: 54f87c12e9 am: 9c5f12cab9
Original change: https://android-review.googlesource.com/c/platform/build/+/1431045

Change-Id: I2a9030ee1014488f8dc6b3c8c52664118c3b7d0b
2020-09-21 17:21:13 +00:00
Tim Van Patten
fad0ce8296 Add ANGLE.apk to the base system
This CL re-enables building ANGLE as parta of the base system. This was
done up until the recent merge of goog/master to aosp/master, and is
required as part of enabling ANGLE as the default OpenGL ES driver for
Cuttlefish.

Bug: b/168625635
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I12c8db290ed7dc6b213b6f1c22692666dcdf143f
Merged-In: Ide4e3d8f78d3748d557a47ecd153d66694fd1e3a
2020-09-18 11:32:01 -06:00
Yanting Yang
88156d11d9 Remove SafetyRegulatoryInfo from generic system
SafetyRegulatoryInfo should not exist in AOSP.

Fixes: 166139891
Test: make && flash to verify regulatory option of Settings
Merged-In: I5fbef719ba30cdbf37e0d4c6daa06a50c06e9495
Change-Id: I5fbef719ba30cdbf37e0d4c6daa06a50c06e9495
2020-09-18 06:57:15 +00:00
David Anderson
e5c8867691 Add virtual A/B compression product.
Sets ro.virtual_ab.compression.enabled and includes snapuserd_ramdisk.

A device will do the following to enable virtual a/b compression:

$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota_compression.mk)

Bug: 168257347
Test: build with product included
Change-Id: Ide19576a69629389a7878d5dff3c5706c22527d9
2020-09-17 12:15:19 -07:00
Calvin Huang
d05c58cf12 Merge "Add an aosp target that supports 64-bit app only" into rvc-qpr-dev am: 0605e11f99
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12503225

Change-Id: I8594b3044d28b6469172e1dd33852cf5add8f955
2020-09-17 19:08:42 +00:00
Sam Lin
d001fb334d Add an aosp target that supports 64-bit app only
Bug: 164166032
Test: N/A
Change-Id: I57116fe67cbe1322f348c9d0506655f32a900dcc
2020-09-16 17:15:10 -07:00
Treehugger Robot
3f2eab4fb2 Merge "llkd: moved from optional to required component" am: e1239cd1ad am: ab45f8b97c am: aa71197643 am: 07dc604680
Original change: https://android-review.googlesource.com/c/platform/build/+/1421668

Change-Id: I1b18b3ccb35cf4e0fe0a633bd5272bac8b0e5efe
2020-09-08 19:56:23 +00:00
Treehugger Robot
aa71197643 Merge "llkd: moved from optional to required component" am: e1239cd1ad am: ab45f8b97c
Original change: https://android-review.googlesource.com/c/platform/build/+/1421668

Change-Id: I91ec0f43d6fc5345477ae37945c363d5659e46f1
2020-09-08 19:27:24 +00:00
Treehugger Robot
ab45f8b97c Merge "llkd: moved from optional to required component" am: e1239cd1ad
Original change: https://android-review.googlesource.com/c/platform/build/+/1421668

Change-Id: I9c651d8a902c5fe7fc77a7ae0d2ef73593eebc1a
2020-09-08 18:58:12 +00:00
Mark Salyzyn
fbb45227c0 llkd: moved from optional to required component
The Live Lock Killer Daemon (llkd) has provided enough hero moments to
improve system stability, by providing actionable collection of data
to resolve kernel, and some user space, misbehaviors.  It is time to
move llkd to a required component.

NB: For llkd to be effective at finding real kernel live lock
conditions, system requirements are that there are no more un-waited
for Zombie processes, and that no kernel drivers use indeterminate
periods of uninterruptible sleep.  Any kernel and user space tasks
that are killed because of suspicious behavior, must themselves have
a benefactor to restart them if necessary.  If a true live lock is
discovered, data will be collected and the kernel will be panic'd to
recover from the situation.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 164946924
Test: llkd is ever present on a release build.
Change-Id: I986a8545252bc5b68d09a6a0f4f506a58998c8a0
2020-09-08 07:58:16 -07:00
Tim Van Patten
7cd1fdbfbb Merge "Indicate ANGLE is present on devices" am: 27ca29a3c7 am: 288133d95d am: 29a62efb80 am: 9a31e9eff9
Original change: https://android-review.googlesource.com/c/platform/build/+/1395711

Change-Id: I6840a88336ba4719dd9b5b62b51beb3514bac21d
2020-09-02 17:57:33 +00:00
Tim Van Patten
29a62efb80 Merge "Indicate ANGLE is present on devices" am: 27ca29a3c7 am: 288133d95d
Original change: https://android-review.googlesource.com/c/platform/build/+/1395711

Change-Id: I18496607c8a94b818cb83a63694fd384a18d48a3
2020-09-02 16:35:04 +00:00
Tim Van Patten
288133d95d Merge "Indicate ANGLE is present on devices" am: 27ca29a3c7
Original change: https://android-review.googlesource.com/c/platform/build/+/1395711

Change-Id: I6f4e173192db664d5d1462179b5b44b821596674
2020-09-02 15:55:50 +00:00
Emilian Peev
208bbdd21b Cherry-pick spirit of 23abbfeb4b
(Revert "Add libdepthphoto to mainline_system")

Bug: 167450283
Fixed: 167450283
Merged-In: Id2013f80dbc962f70ccb1b687c0dc18fef372348
Change-Id: Id2013f80dbc962f70ccb1b687c0dc18fef372348
2020-09-01 23:25:07 +00:00
Tim Van Patten
d38244210f Indicate ANGLE is present on devices
The system property ro.gfx.angle.supported needs to be enabled when
ANGLE is included in a build to indicate to the platform and CTS tests
that ANGLE is present on the device.

Test: atest CtsAngleIntegrationHostTestCases
Bug: 157670307
Merged-in: Ide4e3d8f78d3748d557a47ecd153d66694fd1e3a
Change-Id: I72ba8731fed36dbc594dae88aaa00a6299e8f4ae
2020-09-01 13:26:18 -06:00
Xin Li
c2fd58fe67 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: Ie00dbea32e074838466eeed00f316250c2b4f3c2
Change-Id: I9ee3441fd4d063b9dd489cb1b01d3dbc11332457
2020-08-29 01:19:44 -07:00
Steven Moreland
3e27237e5e Merge "vndservice removed if w/o vndservicemanager" am: 0113aa2070 am: 9d0f80aa9f am: 6c8f9f6830 am: 0a6c654d9f
Original change: https://android-review.googlesource.com/c/platform/build/+/1402963

Change-Id: Iedb083c5df58dbf2279a4dcb6fba055918a24e17
2020-08-18 20:57:30 +00:00
Steven Moreland
6c8f9f6830 Merge "vndservice removed if w/o vndservicemanager" am: 0113aa2070 am: 9d0f80aa9f
Original change: https://android-review.googlesource.com/c/platform/build/+/1402963

Change-Id: I7835e20a072fa60b03fffe3f08097d81adaffd1b
2020-08-18 20:28:45 +00:00
Steven Moreland
0113aa2070 Merge "vndservice removed if w/o vndservicemanager" 2020-08-18 20:06:46 +00:00
Steven Moreland
152a619d34 vndservice removed if w/o vndservicemanager
This binary is for talking to vendor services, and it'll hang if
vndservicemanager is not available. On devices where it isn't supported,
just remove it.

Fixes: 165043609
Test: N/A
Change-Id: I908c8771c37deb79cf36efb10e66b7fff7adcedf
2020-08-17 23:59:58 +00:00
Treehugger Robot
a0431fa84b Merge "Enable configurable audio policy on generic_system" am: baade4a3c4 am: e60f9825b9 am: 4c9cacaa40 am: 5e6b018298
Original change: https://android-review.googlesource.com/c/platform/build/+/1395771

Change-Id: I80d1040f0ac89869e9d26480b4abb234586fbcba
2020-08-17 09:38:46 +00:00
Treehugger Robot
4c9cacaa40 Merge "Enable configurable audio policy on generic_system" am: baade4a3c4 am: e60f9825b9
Original change: https://android-review.googlesource.com/c/platform/build/+/1395771

Change-Id: I48da940076b5e09aba74045458d914ab7d43cb0c
2020-08-17 09:15:41 +00:00
Hongguang Chen
370a65b4c3 Enable configurable audio policy on generic_system
BUG: 132639720
BUG: 163379087
Test: make aosp_arm64 and check artifacts.
Change-Id: Ide4dc68d5770854daa3acdff5dda78dfa4a941bc
Merged-In: Ide4dc68d5770854daa3acdff5dda78dfa4a941bc
2020-08-14 09:23:56 -07:00
JaeMan Park
a5bae4c780 Merge "Rename mainline_system(.*).mk to generic_system(.*).mk" into rvc-dev-plus-aosp am: 147c895039 am: c75de1fd2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12344111

Change-Id: I420f5d490d80504b368f981ca2a021cf6d1d1eb2
2020-08-14 02:02:39 +00:00
JaeMan
20cdc90938 Rename mainline_system(.*).mk to generic_system(.*).mk
Rename mainline_system to generic_system in mk files
to avoid confusion with mainline module.

First, move mainline_system(.*).mk to generic_system(.*).mk
and make previous mainline_system(.*).mk to just inherit
generic_system(.*).mk to make alias except mainline_system.mk.
is just symlink to generic_system.mk.

These aliasing file will be kept remain during migration
for preventing build breakage and making changes possible
during migration.

Bug: 160649682
Test: lunch generic_system_arm64 && m nothing
Test: lunch generic_system_x86 && m nothing
Test: lunch generic_system_x86_64 && m nothing
Test: lunch generic_system_x86_arm && m nothing
Test: lunch mainline_system_arm64 && m nothing
Test: lunch mainline_system_x86 && m nothing
Test: lunch mainline_system_x86_64 && m nothing
Test: lunch mainline_system_x86_arm && m nothing
Change-Id: I3609ec2d91b0f08859a36cac75c25876b1db6d6a
Merged-In: I3609ec2d91b0f08859a36cac75c25876b1db6d6a
(cherry picked from commit 6f16b5764b)
2020-08-13 07:39:30 +00:00
JaeMan
0116b6cb0e Rename mainline_system(.*).mk to generic_system(.*).mk
Rename mainline_system to generic_system in mk files
to avoid confusion with mainline module.

First, move mainline_system(.*).mk to generic_system(.*).mk
and make previous mainline_system(.*).mk to just inherit
generic_system(.*).mk to make alias except mainline_system.mk.
is just symlink to generic_system.mk.

These aliasing file will be kept remain during migration
for preventing build breakage and making changes possible
during migration.

Bug: 160649682
Test: lunch generic_system_arm64 && m nothing
Test: lunch generic_system_x86 && m nothing
Test: lunch generic_system_x86_64 && m nothing
Test: lunch generic_system_x86_arm && m nothing
Test: lunch mainline_system_arm64 && m nothing
Test: lunch mainline_system_x86 && m nothing
Test: lunch mainline_system_x86_64 && m nothing
Test: lunch mainline_system_x86_arm && m nothing
Change-Id: I3609ec2d91b0f08859a36cac75c25876b1db6d6a
Merged-In: I3609ec2d91b0f08859a36cac75c25876b1db6d6a
(cherry picked from commit 6f16b5764b)
2020-08-13 05:04:46 +00:00
Dan Willemsen
c9fbe64e90 Merge "Remove obsolete PDK build functionality" into rvc-dev-plus-aosp am: 3d3cd8a6df am: c17252f300
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12347726

Change-Id: I6ec7720b0224b55a8b32f2d73e1ed66b75b3ab81
2020-08-11 06:47:17 +00:00
Dan Willemsen
a3f6632de9 Remove obsolete PDK build functionality
This hasn't worked for a couple years, and continues to bitrot. Just
remove it.

Test: treehugger
Change-Id: Iea6caf3c08252a560155e095135c5ddaad712991
Merged-In: Iea6caf3c08252a560155e095135c5ddaad712991
2020-08-11 01:12:01 +00:00
Dan Willemsen
110a51cbde Remove obsolete PDK build functionality
This hasn't worked for a couple years, and continues to bitrot. Just
remove it.

Test: treehugger
Change-Id: Iea6caf3c08252a560155e095135c5ddaad712991
2020-08-10 18:08:54 -07:00
Treehugger Robot
9027dff781 Merge "Deprecate VNDK-lite support from Legacy GSI" am: c45c04e38e am: 1e220966a7 am: e904d0e193 am: 35d3e751fd
Original change: https://android-review.googlesource.com/c/platform/build/+/1382483

Change-Id: Iac65b1f69dc99f5fbce8747fb2f86e0cbf7ff83d
2020-08-06 20:16:10 +00:00
Treehugger Robot
e904d0e193 Merge "Deprecate VNDK-lite support from Legacy GSI" am: c45c04e38e am: 1e220966a7
Original change: https://android-review.googlesource.com/c/platform/build/+/1382483

Change-Id: I71b572821a1f9c57c485fed9f95ddf1d45a54fd1
2020-08-06 19:36:03 +00:00
Treehugger Robot
c45c04e38e Merge "Deprecate VNDK-lite support from Legacy GSI" 2020-08-06 18:53:55 +00:00
SzuWei Lin
a42efe57a3 Deprecate VNDK-lite support from Legacy GSI
The VNDK-lite is deprecated from S. Which is used to support the
devices without enabling VNDK.

The patch removes VNDK-lite from Legacy GSI. Also, reboot the
device without enabling VNDK in both non-Legacy and Legacy GSI.

Bug: 158719241
Test: boot aosp_arm64-userdebug on a Pixel 3 device
Test: boot aosp_arm64_ab-userdebug on a Pixel 2 device
Change-Id: I70a944bb5a2a0347ab753d29eca3d1bfcae54526
2020-08-06 14:04:06 +08:00
Selene Huang
1d015a5d35 Make related stuff for Keymint V1.
Test: not tested

Change-Id: Icfd129fc2df902115c2d13ada91a8e005527fcf0
2020-08-05 02:28:34 -07:00
Roshan Pius
dfbf38599c Revert "Revert "product: Remove wifi-service off SystemServerCla..." am: 48825727f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12282976

Change-Id: Icf14b0d6862a0572f67a547faf1760a2d891a439
2020-08-04 00:45:39 +00:00
Roshan Pius
48825727f6 Revert "Revert "product: Remove wifi-service off SystemServerCla..."
Revert submission 10144846-revert-10103769-load_wifi_service_dynamically-XZNQJHXURR

Reason for revert: Changes in build system to store uncompressed and aligned DEX files for java libs in APEXes.

Reverted Changes:
Icc0b680c2: Revert "SystemServer: Dynamically load wifi-servic...
I83a2f93e3: Revert "product: Remove wifi-service off SystemSer...

Bug: 148099857
Bug: 162371380
Bug: 162746981
Test: build
Change-Id: Ia40bc9dec81347e205e5ff81d7b9045655fbe13a
2020-08-03 17:27:21 +00:00
Orion Hodson
b1cb2ceaec Merge "Update ART people in OWNERS" am: 1e78685543 am: 9e635161cb
Original change: https://android-review.googlesource.com/c/platform/build/+/1376377

Change-Id: Ia458c55ca6a9c0a43d0c0778b23df924e7e99f7d
2020-08-03 09:04:24 +00:00