Commit Graph

5833 Commits

Author SHA1 Message Date
Nikita Ioffe 46fe30f89c Merge "Don't inherit userspace_reboot.mk from mainline_system.mk"
am: c3d679bb88

Change-Id: Ie120fdd9d26df013d9f911f4fc53ac282d136ff3
2020-01-30 03:24:06 -08:00
Nikita Ioffe 18548cccc8 Don't inherit userspace_reboot.mk from mainline_system.mk
Test: Checked that userspace_reboot.mk is included in device makefiles
Test: build
Bug: 135984674
Change-Id: If910e2a6baf8acaafc8bafdf8193ba7237f66f1a
Merged-In: If910e2a6baf8acaafc8bafdf8193ba7237f66f1a
(cherry picked from commit 0f38beca94)
2020-01-30 00:11:11 +00:00
Daniel Rosenberg 0675f9d743 Merge "Add build properties to enable casefold and prj_quota"
am: dac25a96df

Change-Id: I0ce364177d52a683a156cca012e18019a47d4c46
2020-01-28 16:04:41 -08:00
Daniel Rosenberg dac25a96df Merge "Add build properties to enable casefold and prj_quota" 2020-01-28 23:53:25 +00:00
Daniel Rosenberg 6cc2c81f4d Add build properties to enable casefold and prj_quota
This adds the ability to format f2fs and ext4 in a way that supports
casefolding and project quotas. Project quotas require wider inodes, and
thus cannot be enable apart from at build time. Casefolding can be
configured with f2fs.fsck/tune2fs later.

Both features are enabled via inheriting emulated_storage.mk in the
device.mk

Bug: 138322712
Bug: 138321217
Test: Enable on device with related patches, view fs configuration on /data
Change-Id: Ib1ab0589006ff1b3fb7478b7e9b0a8aad71e4b09
2020-01-27 12:45:47 -08:00
Janis Danisevskis 2516500005 Merge "Remove keymaster libraries from VNDK"
am: f78c9f6e3c

Change-Id: If6720951f01b916fa8d3cd687ff43e1aef9e81fd
2020-01-27 10:05:50 -08:00
Yifan Hong 46d591b9c5 Merge changes from topics "board_use_recovery_as_root_soong", "ramdisk"
am: cb0e97750a

Change-Id: Icd6796c815b2cce84af9338fcf379dda87c24883
2020-01-24 16:32:07 -08:00
Janis Danisevskis e8484f2160 Remove keymaster libraries from VNDK
These keymaster libraries constitute a service to vendors
who want/need to implement a keymaster trusted app, or want
to wrap an older keymaster HAL when updating an older device
to a newer Android version. It is not necessary to implement
or link against these libraries to be Android or Treble
compliant. Many vendors have completely independent
implementations of keymaster. Vendors should be able to
provide there own versions of these libraries or ship without
them entirely. /system does not depend on /vendor to have
a compatible version of these libraries.

Test: N/A
Bug: 139955894
Merged-In: I9286b36d26f09e26763df17758f9bec9e2b60ec8
Change-Id: I9286b36d26f09e26763df17758f9bec9e2b60ec8
2020-01-24 14:44:36 -08:00
Yifan Hong cb0e97750a Merge changes from topics "board_use_recovery_as_root_soong", "ramdisk"
* changes:
  Add e2fsck_ramdisk for VAB devices
  Export BOARD_USES_RECOVERY_AS_BOOT to soong.
2020-01-24 22:39:41 +00:00
Automerger Merge Worker 1454e7cc5c Merge "libprotobuf-cpp-lite is removed from VNDK." am: 7ad254aee9
Change-Id: Idb64c5be511bd588704962866809036ab1be6c1a
2020-01-24 14:10:04 +00:00
Yifan Hong 04d4c08929 Add e2fsck_ramdisk for VAB devices
e2fsck_ramdisk is critical for VAB devices to boot
after an OTA in case of corruption in metadata partition.

Test: pass
Bug: 147347110
Change-Id: I44ce456c11961ec978dcb4e68c32d72c1fab0c4d
2020-01-23 13:21:09 -08:00
Jiyong Park d918cadcc0 libprotobuf-cpp-lite is removed from VNDK.
It is demoted to vendor_available library. Therefore it will be
installed to /vendor/lib[64] instead of /system/lib[64]/vndk.

Bug: 147780271
Test: m
Merged-In: I40a94a3ecf55592b8e2f83f43070fa958c532cef
Change-Id: I40a94a3ecf55592b8e2f83f43070fa958c532cef
(cherry picked from commit 87889b0d4d)
2020-01-23 13:11:09 +09:00
Jack Yu d33e74f9e5 Merge "Add android.hardware.secure_element@1.2"
am: 4b26ce076a

Change-Id: Ia20f33520e6b5af467caf4a5f318269afcc42c0c
2020-01-22 19:21:48 -08:00
Treehugger Robot 4b26ce076a Merge "Add android.hardware.secure_element@1.2" 2020-01-23 02:00:02 +00:00
Yifan Hong 031ba1bd6b Merge "Remove BUILT_VENDOR_MANIFEST variable."
am: 4de0c0906d

Change-Id: I8fc4de1e1291c54e892cd8afbd4a8ca3a943661e
2020-01-21 14:17:47 -08:00
Yifan Hong 4de0c0906d Merge "Remove BUILT_VENDOR_MANIFEST variable." 2020-01-21 21:33:18 +00:00
Jiyong Park 930eb7458d Merge "libprotobuf-cpp-full is removed from VNDK."
am: 3cff56942a

Change-Id: Ib9dabfdd95b996c53d1dfc6bc64bf410c9ac0357
2020-01-19 23:37:09 -08:00
Treehugger Robot 3cff56942a Merge "libprotobuf-cpp-full is removed from VNDK." 2020-01-20 07:32:36 +00:00
Automerger Merge Worker dfb5e28588 Merge "Compare existing ABI dump list with LSDUMP_PATHS" am: 4367e6cc51
Change-Id: I3765bce4715449a9b7fc99e06275340c04ae0058
2020-01-17 03:23:04 +00:00
Hsin-Yi Chen 4367e6cc51 Merge "Compare existing ABI dump list with LSDUMP_PATHS" 2020-01-17 02:09:39 +00:00
Wei Wang 91e8905596 Merge "Add stable aidl power HAL"
am: add214cdee

Change-Id: I3d5351c0ef408b87f0a14d2cb989e40d97e5e2d5
2020-01-16 14:40:00 -08:00
Wei Wang add214cdee Merge "Add stable aidl power HAL" 2020-01-16 22:35:42 +00:00
TreeHugger Robot 2f0743483b Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master 2020-01-16 18:29:25 +00:00
Jiyong Park 8da1b9add3 libprotobuf-cpp-full is removed from VNDK.
It is demoted to vendor_avaialble library. Therefore it will be
installed to /vendor/lib[64] instead of /system/lib[64]/vndk.

Bug: 147780271
Test: m
Change-Id: I9db6147d6e6005177660e56e3ee42475c103d198
2020-01-17 00:55:52 +09:00
Yifan Hong 2e4f20f540 Merge "device_(manifest|matrix).xml -> vendor_*" 2020-01-16 04:09:08 +00:00
Hsin-Yi Chen 62de555119 Compare existing ABI dump list with LSDUMP_PATHS
This commit fixes the check for redundant files in prebuilts/abi-dumps.
Some ABI dump file names are different from the module names. The list
of existing files should be compared with LSDUMP_PATHS which are the
files generated by soong.

This commit also adds the check for the files in
prebuilts/abi-dumps/platform.

Bug: 147409497
Test: make
Change-Id: If304afb116e9b5d3cb7ceaf74822d5a19ebe1a35
2020-01-16 10:46:30 +08:00
Xin Li 6764f473a5 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
Bug: 146167222
Change-Id: I5adf4130f45200f3abfa2d65178a1640918e5a06
2020-01-15 15:56:28 -08:00
Yifan Hong 975474a5b8 Remove BUILT_VENDOR_MANIFEST variable.
This was used by BUILT_SYSTEM_MATRIX and BUILT_ASSEMBLED_VENDOR_MANIFEST, but they
are deleted now.

Test: builds
Change-Id: Ie7e242dce9c6511b90fcf06ae4b6926b230b9873
2020-01-14 14:25:38 -08:00
Yifan Hong 51be69f063 device_(manifest|matrix).xml -> vendor_*
Building device_manifest.xml or device_compatibility_matrix.xml only
builds vendor manifest / matrices, but not all device manifest /
matrices (e.g. vintf_fragments, ODM manifest, etc.). Make the name more
accurate.

Test: m check-vintf-all

Change-Id: Ib017507c421355263d53a9e5b357f169c77da36d
2020-01-14 14:24:51 -08:00
David Zeuthen dcc85ca5dd Add Identity Credential 1.0
Bug: 111446262
Test: VtsHalIdentityCredentialTargetTest
Test: android.hardware.identity-support-lib-test
Test: CtsIdentityTestCases
Change-Id: I91bf3a0551c4c0358d5f0de066739dcc05de1642
2020-01-14 11:21:03 -05:00
Wei Wang 6231592500 Add stable aidl power HAL
Test: build
Change-Id: Ia3edaf6df52d2725cd6c2d34e5985b1dc16e8f3c
2020-01-10 14:18:23 -08:00
Automerger Merge Worker 63c8e0382e Merge "Revert "unbreak sdk_phone_x86 boot"" am: c30b734f42 am: 30a5c0cf8b
Change-Id: Icd73510d6e002622188788c68db527f08df7c42d
2020-01-09 17:32:00 +00:00
Bo Hu c30b734f42 Merge "Revert "unbreak sdk_phone_x86 boot"" 2020-01-09 16:56:35 +00:00
Automerger Merge Worker 4b482e337e Merge "Update references to sdkext" am: b9e912dc9d am: 2bba9827af
Change-Id: I3716fa082509f3ee2a94c5a3ab3c78a444da0cd9
2020-01-09 09:19:39 +00:00
Bo Hu 08a2677fe7 Revert "unbreak sdk_phone_x86 boot"
This reverts commit 70c96c7f11.

Reason for revert: root cause fixed

Bug: 146580512
Change-Id: I5d841637d5ca0ae8df8f5499a8b3f02488b4814e
2020-01-09 02:35:07 +00:00
Anton Hansson ea711c2418 Update references to sdkext
The module is getting renamed to sdkextensions.

Bug: 137191822
Test: presubmit
Change-Id: I628fc555b82e9bd931c8f0cce2222b02efad6036
Merged-In: I628fc555b82e9bd931c8f0cce2222b02efad6036
(cherry picked from commit 37e998ac31)
2020-01-08 11:42:03 +00:00
Automerger Merge Worker 950604f8da Merge "vibrator: use package as name" am: c8b0187c8b am: e819518de8
Change-Id: If810c6606b9e40150f74848874b01152addf7b73
2020-01-07 23:07:40 +00:00
Steven Moreland c8b0187c8b Merge "vibrator: use package as name" 2020-01-07 22:43:01 +00:00
Automerger Merge Worker 9a0acae5e9 Merge "Revert submission 1182953-1576003954286-8455af5a" am: 42f2c761bf am: 7da11edb71
Change-Id: Ife36d7f71d16943e0044ab8e1155aeb74edfb6c6
2020-01-07 20:29:39 +00:00
Chen Xu 42f2c761bf Merge "Revert submission 1182953-1576003954286-8455af5a" 2020-01-07 19:29:08 +00:00
Automerger Merge Worker ea31abaf4f Merge "Clean up TARGET_FLATTEN_APEX lines in mainline products" am: 3ac9a12f5f am: 2eee2cd593
Change-Id: I1a634deadbbad49cfabf4ead80c0f0581e34ce82
2020-01-07 09:17:41 +00:00
Yo Chiang 3ac9a12f5f Merge "Clean up TARGET_FLATTEN_APEX lines in mainline products" 2020-01-07 08:41:53 +00:00
Automerger Merge Worker a93eac7c3f Merge "Revert "Add boringssl_self_test to PRODUCT_PACKAGES"" am: ee83e2d2c8 am: 44e7c20968
Change-Id: I607fded6b55a3470fa705be224ffb19ef35d2380
2020-01-07 04:19:39 +00:00
Treehugger Robot ee83e2d2c8 Merge "Revert "Add boringssl_self_test to PRODUCT_PACKAGES"" 2020-01-07 03:51:29 +00:00
Automerger Merge Worker 4c5e852883 Merge "update-vndk-list.sh delinated with ticks in error" am: 0fe0eda502 am: 81e3cfa8a3
Change-Id: I0b00593d9a43f21093cb41fe02af536b3c7ec17b
2020-01-07 02:07:59 +00:00
Steven Moreland 7e2ec0e5af update-vndk-list.sh delinated with ticks in error
People have asked me on several occassions how to fix this error. It's
somewhat confusing since scripts aren't usually on a path. However, in
this case, the script is added to the path on host. Hopefully, using
tick marks here will make that more clear.

Bug: N/A
Test: N/A
Change-Id: I8601a5a9eb348b2e358875b45eae57ec910c9a06
2020-01-06 15:05:07 -08:00
Steven Moreland af96f5ff4e vibrator: use package as name
In order to provide a more descriptive name, and to be consistent
with HIDL, the stable AIDL package names are switching from
vintf-vibrator format to the package format
(android.hardware.vibrator).

Bug: N/A
Test: all build time
Change-Id: I382074d66b06669876d8f9fa4fc95b8a9c4dbf2a
Merged-In: I382074d66b06669876d8f9fa4fc95b8a9c4dbf2a
2020-01-06 14:08:00 -08:00
Yo Chiang 4a5ff18a01 Clean up TARGET_FLATTEN_APEX lines in mainline products
Remove redundant TARGET_FLATTEN_APEX lines from mainline board configs.
Remove redundant "inherit updatable_apex.mk" lines from
mainline_system_$arch makefiles.
mainline_system.mk now always install APEX into /system partition.
Products who need flattened APEXes would have their flattened APEXes
installed into /system_ext.

Test: Build mainline_system_arm64 and validate noop
Change-Id: I9ee4af529a4bd554cb8707cfc260d6b912fd5fff
2019-12-30 16:19:28 +08:00
Jiyong Park aeda4b267b Revert "Add boringssl_self_test to PRODUCT_PACKAGES"
This reverts commit ac4a35f017.

The change is not required because the conscrypt APEX now has
'boringssl_self_test' as its required modules.

Bug: 146549048
Test: m && device boots
2019-12-30 16:58:34 +09:00
Automerger Merge Worker f037120754 Merge "Add Multidisplay App and so to whitelist" into qt-qpr1-dev am: dd82625f27
Change-Id: Ic853e3d5fd0e9f4725062995ce34b06feb09a8f2
2019-12-27 16:01:39 +00:00