Emilian Peev
23abbfeb4b
Revert "Add libdepthphoto to mainline_system"
...
This reverts commit 55b9c1b651
2020-01-02 12:54:30 -08:00
Automerger Merge Worker
d479001a05
Merge "Add Multidisplay App and so to whitelist" into qt-qpr1-dev am: dd82625f27 am: f037120754
...
Change-Id: Idbbe6b1bb2c2a4fa80a701dfe5f9772ff1284b4a
2019-12-31 18:20:41 +00:00
Chen Xu
0d9f3cb2fb
Merge "Revert submission 1182953-1576003954286-8455af5a"
2019-12-27 18:56:38 +00: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
8ac23e29a5
Merge "Stop removing valid copy headers" am: 4506b17dd3 am: 04b25efc91 am: 4e3a78ff3b
...
Change-Id: If41beb9184182eb0fed3f83bc4cca11ca9636f00
2019-12-27 02:53:01 +00:00
Automerger Merge Worker
4e3a78ff3b
Merge "Stop removing valid copy headers" am: 4506b17dd3 am: 04b25efc91
...
Change-Id: Ife2bd4fd3526828b667a591415e7f4689c325aa2
2019-12-27 02:37:58 +00:00
Dan Willemsen
04b25efc91
Merge "Stop removing valid copy headers"
...
am: 4506b17dd3
2019-12-26 18:20:15 -08:00
Treehugger Robot
4506b17dd3
Merge "Stop removing valid copy headers"
2019-12-27 02:15:26 +00:00
Dan Willemsen
13cb165b91
Stop removing valid copy headers
...
My change to clean up obsolete copy headers would remove valid ones if
thhe LOCAL_COPY_HEADERS_TO path wasn't cleaned. I'm seeing this most
with values that just end in '/', so we end up with a '//' in the path,
which isn't textually equivalent, and we remove it.
Test: No longer seeing constant removals on internal products
Test: Set LOCAL_COPY_HEADERS_TO := ..
Test: Set LOCAL_COPY_HEADERS_TO := ../foo
Test: Set LOCAL_COPY_HEADERS_TO := /foo
Change-Id: Idbeeb207a2bb2a8da766473dbded877cec7c9cc1
2019-12-26 16:52:34 -08:00
Automerger Merge Worker
a8eab50647
Merge "Do not build ld.config.txt" am: f1ef5591f1 am: 63e1d4d899 am: 1785dcfe52
...
Change-Id: Ie53f50ad3ae9d4d00c7bbb0d86a459b5e8d9db60
2019-12-27 00:37:17 +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
63e1d4d899
Merge "Do not build ld.config.txt"
...
am: f1ef5591f1
2019-12-26 16:10:59 -08:00
Kiyoung Kim
f1ef5591f1
Merge "Do not build ld.config.txt"
2019-12-27 00:08:06 +00:00
Jeff Davidson
9ae31126ea
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
2019-12-26 15:19:11 -08:00
Automerger Merge Worker
72e79a2fe3
Merge "unbreak sdk_phone_x86 boot" am: 7c18a37147 am: d3e86cfd66 am: 541c3e98cf
...
Change-Id: I1bdd00e0f2bd0748668ecc7969c3a960ad0aa9d1
2019-12-26 16:30:09 +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
Jiyong Park
d3e86cfd66
Merge "unbreak sdk_phone_x86 boot"
...
am: 7c18a37147
2019-12-26 08:01:30 -08:00
Treehugger Robot
7c18a37147
Merge "unbreak sdk_phone_x86 boot"
2019-12-26 15:51:49 +00:00
Automerger Merge Worker
726f056d22
Merge "Define ro.product.vndk.version" am: e8139b905d am: a126b69335 am: 4bce5b4f4b
...
Change-Id: I4069c767e082a961ee456f2fd0f01a6c922c2f3b
2019-12-25 09:32:21 +00:00
Automerger Merge Worker
4bce5b4f4b
Merge "Define ro.product.vndk.version" am: e8139b905d am: a126b69335
...
Change-Id: If7676e80733b8a4a6b4e958a20f8e9d9e3fcf322
2019-12-25 09:15:53 +00:00
Justin Yun
a126b69335
Merge "Define ro.product.vndk.version"
...
am: e8139b905d
2019-12-25 01:02:58 -08:00
Treehugger Robot
e8139b905d
Merge "Define ro.product.vndk.version"
2019-12-25 08:28:50 +00:00
Justin Yun
04e5a40f2c
Define ro.product.vndk.version
...
Use ro.product.vndk.version to show the VNDK version that the product
partition is using.
When PRODUCT_PRODUCT_VNDK_VERSION is set, add ro.product.vndk.version
in /product/build.prop.
If PRODUCT_PRODUCT_VNDK_VERSION is "current", ro.product.vndk.version
will have the VNDK version in PLATFORM_VNDK_VERSION. Otherwise, it
will have the value defined in PRODUCT_PRODUCT_VNDK_VERSION.
Bug: 144534640
Test: Check if /product/build.prop has "ro.product.vndk.version"
Change-Id: If5e7e3a6c155de45f88f68700f16175656896afe
2019-12-24 07:20:43 +00:00
Automerger Merge Worker
20e8d991d2
Merge "Only dist recovery_ramdisk if BOARD_USES_RECOVERY_AS_BOOT" am: 9de27595ec am: de2634bdf0 am: 3648df452f
...
Change-Id: I55f1d00a8bafd87b06336749de4e3a21c43bd307
2019-12-24 00:26:15 +00:00
Automerger Merge Worker
3648df452f
Merge "Only dist recovery_ramdisk if BOARD_USES_RECOVERY_AS_BOOT" am: 9de27595ec am: de2634bdf0
...
Change-Id: I9a2d2b6be6992423ae1f8b2117af616dd5b74cce
2019-12-24 00:14:27 +00:00
Daniel Mentz
de2634bdf0
Merge "Only dist recovery_ramdisk if BOARD_USES_RECOVERY_AS_BOOT"
...
am: 9de27595ec
2019-12-23 16:01:00 -08:00
Treehugger Robot
9de27595ec
Merge "Only dist recovery_ramdisk if BOARD_USES_RECOVERY_AS_BOOT"
2019-12-23 23:32:38 +00:00
Automerger Merge Worker
615fc79086
Merge "Add /system/vendor/odm for VINTF search path" am: dafae5228c am: b15c78ea17 am: a582ec70ae
...
Change-Id: I916bb01b9d0cf5655a969cc7f1699ad1f7d4e27a
2019-12-23 23:27:24 +00:00
Automerger Merge Worker
a582ec70ae
Merge "Add /system/vendor/odm for VINTF search path" am: dafae5228c am: b15c78ea17
...
Change-Id: I038ad38a701709a4fd42f4e111412dca33d34ff5
2019-12-23 23:15:47 +00:00
Yifan Hong
b15c78ea17
Merge "Add /system/vendor/odm for VINTF search path"
...
am: dafae5228c
2019-12-23 15:01:31 -08:00
TreeHugger Robot
e96be6bdd2
Merge "preinstalled-packages-platform for profiles"
2019-12-23 22:38:48 +00:00
Yifan Hong
dafae5228c
Merge "Add /system/vendor/odm for VINTF search path"
2019-12-23 22:26:55 +00:00
Daniel Mentz
5a8feb5422
Only dist recovery_ramdisk if BOARD_USES_RECOVERY_AS_BOOT
...
Bug: 146798070
Change-Id: I9e9d313b8ca097b4930fc2c99800772c6bdcbb9e
2019-12-23 14:08:31 -08:00
Automerger Merge Worker
ff7c844f4b
Merge "Dist ramdisk-recovery.img and misc_info.txt" am: b581214e65 am: aa64af5c71 am: 3ff4bb8205
...
Change-Id: I23e989b93cccf809dac3fcf0d5c64598543234eb
2019-12-23 19:05:44 +00:00
Automerger Merge Worker
3ff4bb8205
Merge "Dist ramdisk-recovery.img and misc_info.txt" am: b581214e65 am: aa64af5c71
...
Change-Id: I3002e62d53c4d21d3dcc26269583782048a1a047
2019-12-23 18:53:38 +00:00
Daniel Mentz
aa64af5c71
Merge "Dist ramdisk-recovery.img and misc_info.txt"
...
am: b581214e65
2019-12-23 10:41:30 -08:00
Daniel Mentz
b581214e65
Merge "Dist ramdisk-recovery.img and misc_info.txt"
2019-12-23 18:36:07 +00:00
Daniel Mentz
4d6017d519
Dist ramdisk-recovery.img and misc_info.txt
...
Dist ramdisk-recovery.img and misc_info.txt. This is useful for
re-creating boot.img without having to download a huge target_files zip
file.
Change-Id: I2e1c1d547c95ca3433f89c68428c0c98fa4d19cd
2019-12-23 18:35:17 +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
f175b63dfd
Merge "Move group_system_ext and passwd_system_ext to base_system_ext.mk" am: 6e487404ed am: beb44e1d01 am: 2958b05847
...
Change-Id: I62d8237f2266eb6860121f66827d83a0b63b959a
2019-12-23 11:31:17 +00: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
beb44e1d01
Merge "Move group_system_ext and passwd_system_ext to base_system_ext.mk"
...
am: 6e487404ed
2019-12-23 03:04:55 -08:00
Treehugger Robot
6e487404ed
Merge "Move group_system_ext and passwd_system_ext to base_system_ext.mk"
2019-12-23 11:02:45 +00:00
Automerger Merge Worker
5a074943e8
Merge changes from topic "runtime_apex_available" am: 982da2812f am: 2320db6261 am: 069bb10478
...
Change-Id: I7526e2356d3d7f0c01644600c2e89f43c83ac6f5
2019-12-23 05:20:44 +00:00
Automerger Merge Worker
069bb10478
Merge changes from topic "runtime_apex_available" am: 982da2812f am: 2320db6261
...
Change-Id: I99a596b5c6d0393d6976c7231b49a4ef3b67b4cf
2019-12-23 05:06:42 +00:00
Jiyong Park
2320db6261
Merge changes from topic "runtime_apex_available"
...
am: 982da2812f
2019-12-22 20:54:18 -08:00
Treehugger Robot
982da2812f
Merge changes from topic "runtime_apex_available"
...
* changes:
apex-libs-absence checks are removed
Remove bionic libs from APEX_MODULE_LIBS check
Use apex_available property
2019-12-23 04:50:53 +00:00
Jiyong Park
22195346dd
apex-libs-absence checks are removed
...
The check is implemented in Soong via the apex_available property.
For a module that should be in the APEX named "foo" and shouldn't be in
any other APEX and also in the platform (the non-updatable part), the
property can be set to "foo" (without "//apex_available:platform")
to express the restriction and then Soong will enforce it.
Bug: 128708192
Test: m
Change-Id: Ia1aaaacd685f466447b61deae2849cb0aa83def3
2019-12-23 03:41:59 +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
Jiyong Park
be77c453a7
Remove bionic libs from APEX_MODULE_LIBS check
...
The test was to ensure that bionic libs are not installed to the
non-updatable part of the platform (e.g. system/lib). However, for
bionic libs, we actually have been installing them for bootstrapping.
Specifically, they are installed to /system/lib/bootstrap, not
/system/lib. The test has passed just because it didn't look into
/system/lib/bootstrap. Removing the unnecessary check.
Bug: 128708192
Bug: 133140750
Test: m
Test: m out/target/prduct/$(TARGET_DEVICE)/system/lib/libc.so doesn't
work
Change-Id: I93cbd74972cdd2daea45612136d5133fa49ab76a
2019-12-22 12:25:48 +09:00
