Commit Graph

5917 Commits

Author SHA1 Message Date
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
SzuWei Lin
95bdc96175 Remove a redundant setting
All settings above inheriting aosp_x86.mk are configured in
aosp_x86.mk. Removes inheriting aosp_x86.mk to fit the
makefile convention.

Change-Id: I73eb693915440ceb9d49ac2b6b72d173adf16df3
2020-01-10 01:29:41 +00: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
Josh Gao
552b3f96b2 Add libfdtrack to base_system.
Bug: http://b/140703823
Test: manual
Change-Id: I6015946b85a4564b82eb57a0a0a9bb1e058b100a
2020-01-02 12:44:52 -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
Automerger Merge Worker
1785dcfe52 Merge "Do not build ld.config.txt" am: f1ef5591f1 am: 63e1d4d899
Change-Id: I1bb0689958d9af85e9b78a8c832f13887a889197
2019-12-27 00:25:03 +00:00
Kiyoung Kim
f1ef5591f1 Merge "Do not build ld.config.txt" 2019-12-27 00:08:06 +00:00
Jeff Davidson
4c443e1d4e Revert submission 1182953-1576003954286-8455af5a
Reason for revert: Crashes telephony process when saving XML config from carrier apps (b/146727232)
Reverted Changes:
Ieaeec41f1: Whitelist telephony-common, ims-common.
I5588f7615: Add telephony-common, ims-common to telephony apex...
I81e922c0d: Add telephony-common, ims-common to telephony apex...

Change-Id: Ia64b73682fcc77db63e220867c66c4319c417582
Merged-In: Ia64b73682fcc77db63e220867c66c4319c417582
2019-12-26 23:27:33 +00:00
Automerger Merge Worker
541c3e98cf Merge "unbreak sdk_phone_x86 boot" am: 7c18a37147 am: d3e86cfd66
Change-Id: Ifca20d9e9d56b9dcda8e498f82cf50e04fb94823
2019-12-26 16:13:58 +00:00
Treehugger Robot
7c18a37147 Merge "unbreak sdk_phone_x86 boot" 2019-12-26 15:51:49 +00:00
Jiyong Park
70c96c7f11 unbreak sdk_phone_x86 boot
Bug: 146580512
Test: choosecombo 1 sdk_phone_x86 userdebug; m; emulator
Change-Id: I8227291c89e1cafc35e63eccd2f5ca34ecbd5434
2019-12-23 23:46:55 +09:00
Automerger Merge Worker
2958b05847 Merge "Move group_system_ext and passwd_system_ext to base_system_ext.mk" am: 6e487404ed am: beb44e1d01
Change-Id: I23460fe9675d3f92444135b39a46a34ebbe91f67
2019-12-23 11:17:35 +00:00
Justin Yun
cc1e4cfb6e Move group_system_ext and passwd_system_ext to base_system_ext.mk
As we have base_system_ext.mk for the packages in system_ext
partition, move the group and passwd files for system_ext partition
to base_system_ext.mk.

Bug: 141658360
Test: mainline checks pass
Change-Id: Iff50482b90ff9877a58c54c8149014e8c103a3c6
2019-12-23 10:31:54 +09:00
Automerger Merge Worker
1d3b5b73e4 Merge "[Tether16] Build Tethering package" am: b516ddd539 am: b1dd6eb60d
Change-Id: I0eb011e685fff2d479b26ab9524a2fb7afadb636
2019-12-20 14:00:26 +00:00
Mark Chien
b516ddd539 Merge "[Tether16] Build Tethering package" 2019-12-20 13:43:46 +00:00
Kiyoung Kim
63d6d96653 Do not build ld.config.txt
Remove ld.config.txt from build target as it will be replaced with
generated linker config.

Bug: 139638519
Test: m -j passed
Change-Id: Idc3742df74f27d71d7f65bd7f0f518b31ca7970c
2019-12-20 18:30:07 +09:00
Automerger Merge Worker
6ae6a3e422 Merge changes from topic "art_apex_available" am: 3977cb4f75 am: ca423af91d
Change-Id: I17c9555073ddd043b16ec3f0b8dc01b6f8fd5d09
2019-12-20 01:43:05 +00:00
Treehugger Robot
3977cb4f75 Merge changes from topic "art_apex_available"
* changes:
  Add boringssl_self_test to PRODUCT_PACKAGES
  Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR
2019-12-20 01:17:43 +00:00
Huihong Luo
dd82625f27 Merge "Add Multidisplay App and so to whitelist" into qt-qpr1-dev 2019-12-20 00:29:14 +00:00
Automerger Merge Worker
ff9ebf7705 Merge "Add userspace_reboot.mk and include it in mainline_system.mk" am: 58fa00583c am: e42f12a376
Change-Id: I22eece89788abed73b3ee06f4766d42d23db0af5
2019-12-20 00:26:19 +00:00
Nikita Ioffe
58fa00583c Merge "Add userspace_reboot.mk and include it in mainline_system.mk" 2019-12-19 23:44:06 +00:00