Commit graph

4359 commits

Author SHA1 Message Date
Jooyung Han
13783a7c61 Merge "Revert "install VNDK APEX instead of VNDK libs"" am: e925923af3 am: 7701ecb0a4 am: 67d3695964
am: a1c20ed5c8

Change-Id: Ifcaccd722ba9f8604cfea51ad44a23d01c3dbfbb
2019-10-17 05:36:58 -07:00
Jooyung Han
67d3695964 Merge "Revert "install VNDK APEX instead of VNDK libs"" am: e925923af3
am: 7701ecb0a4

Change-Id: Id245bbb71a1e3a9d0d8ed488992d57d14199ee59
2019-10-17 05:19:01 -07:00
Jooyung Han
7701ecb0a4 Merge "Revert "install VNDK APEX instead of VNDK libs""
am: e925923af3

Change-Id: I6033c86172e87b1fabfc1a86967f7995f640694f
2019-10-17 05:07:58 -07:00
Treehugger Robot
e925923af3 Merge "Revert "install VNDK APEX instead of VNDK libs"" 2019-10-17 11:50:47 +00:00
Jooyung Han
376c613085 Revert "install VNDK APEX instead of VNDK libs"
This reverts commit 172c8e6de0.

Reason for revert: some targets are broken

Bug: 142773030
Change-Id: Ic35b19c7973946658365ecd7de4846f3175054b5
2019-10-16 23:45:38 +00:00
Martin Brabham
47f46c8b1f Merge changes Ie9de9576,I14f7cd06 am: 14fcfb8a9a am: a42177adc4 am: b709c612db
am: c864066cf4

Change-Id: Ibb9224e531d0a1205e8df1f0b570e586d3319478
2019-10-15 15:35:17 -07:00
Martin Brabham
b709c612db Merge changes Ie9de9576,I14f7cd06 am: 14fcfb8a9a
am: a42177adc4

Change-Id: Ie3cb3a5f1d150d8c8305c51a43bc6f928c044ddb
2019-10-15 15:21:34 -07:00
Martin Brabham
a42177adc4 Merge changes Ie9de9576,I14f7cd06
am: 14fcfb8a9a

Change-Id: I9d8688f9681a5821d91c5e1b4105fc6a67cd5c40
2019-10-15 15:15:30 -07:00
Martin Brabham
14fcfb8a9a Merge changes Ie9de9576,I14f7cd06
* changes:
  Set BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW on sdk and full
  Do not initialize BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW
2019-10-15 21:50:42 +00:00
Jooyung Han
999b7194b3 Merge "install VNDK APEX instead of VNDK libs" am: 75d8a47039 am: 97684d7a89 am: 72d9b320bb
am: e7e7079657

Change-Id: I5e87d18796b13d6277cc5a16f094b7903ab9939d
2019-10-15 11:16:28 -07:00
Lev Proleev
12c2d85662 Merge "Add NeuralNetworks HAL v1.3" into qt-r1-dev-plus-aosp 2019-10-15 18:08:35 +00:00
Jooyung Han
72d9b320bb Merge "install VNDK APEX instead of VNDK libs" am: 75d8a47039
am: 97684d7a89

Change-Id: Iaf34f97a5b4299b470ff12e37b99db690a964928
2019-10-15 10:35:12 -07:00
Jooyung Han
97684d7a89 Merge "install VNDK APEX instead of VNDK libs"
am: 75d8a47039

Change-Id: Ic560981bf41a5da9f084f6c26d21041174b4b2e3
2019-10-15 02:43:30 -07:00
Jooyung Han
75d8a47039 Merge "install VNDK APEX instead of VNDK libs" 2019-10-15 09:21:19 +00:00
Inseob Kim
9856889381 Set BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW on sdk and full
This temporariliy turns off treble sysprop neverallow rules which
enforces marking the owner and accessibility to each system property.

Bug: 131162102
Bug: 142684203
Test: m sepolicy_tests
Change-Id: Ie9de9576fcf28c432543ab8f8971c1d048c55819
2019-10-15 17:32:10 +09:00
Jooyung Han
172c8e6de0 install VNDK APEX instead of VNDK libs
VNDK APEX replaces VNDK libs under /system/libs/vndk[-sp].

For current VNDK (vndk_package), com.android.vndk.current APEX is
installed instead of VNDK libraries.

For older versions of VNDK (vndk_snapshot_package),
com.android.vndk.v## APEXes are installed along with prebuilt VNDK libs.
The reason why phony targets of VNDK prebuilts are still installed is
that phony targets install the required *.libraries.##.txt files to
/system/etc.

After those .txt files are moved to APEXes, then we can remove those phony
targets.(b/141450808)

Bug: 141451661
Test: m && boot (tested with cuttlefish)

Change-Id: Ibfa06d42ec0081fa7010091ef097bb940bacf8d6
2019-10-13 04:18:05 +09:00
Steven Moreland
3b9d2dc689 Merge "mainline_system: libhwbinder/libhidltransport" am: 2ce54fa76a
am: a84540e557

Change-Id: I74d9e246243ff2c93ab60b92b61aee1ae6b6dd43
2019-10-11 13:56:23 -07:00
Steven Moreland
a84540e557 Merge "mainline_system: libhwbinder/libhidltransport"
am: 2ce54fa76a

Change-Id: Icf8f192120bbd9f8ee186a52f90f336700cd1704
2019-10-11 13:49:24 -07:00
Steven Moreland
2ce54fa76a Merge "mainline_system: libhwbinder/libhidltransport" 2019-10-11 20:19:13 +00:00
Roshan Pius
da2153126c base_system.mk: Switch back to InProcessWifiStack
Until we fix the RAM usage increase with the out of process version, use
the system_server version.

Bug: 140564146
Test: Device boots up and connects to wifi networks.
Change-Id: I8ebfba7e2ce8fcb7383ce05336dbc0ae7d7a2947
2019-10-11 11:32:04 -07:00
Lev Proleev
e4f453394b Add NeuralNetworks HAL v1.3
Bug: 139120468
Test: m check-vndk-list
Test: m
Change-Id: I2f5d1a66c12509440293c7b5916c337ff1bbe88c
Merged-In: I2f5d1a66c12509440293c7b5916c337ff1bbe88c
(cherry picked from commit fde53f4e3e)
2019-10-11 12:54:46 +01:00
Harpreet "Eli" Sangha
0838439f88 Merge "Add Vibrator HAL 1.4" am: 0ffe0c6248
am: 4a27b4e3fe

Change-Id: Ia79ced4513561f3324f6825e6dadd31ef5d16eca
2019-10-10 17:49:14 -07:00
Harpreet "Eli" Sangha
4a27b4e3fe Merge "Add Vibrator HAL 1.4"
am: 0ffe0c6248

Change-Id: Icc4968fb4f33b173484c5e3ecc028b65fcb0279f
2019-10-10 17:43:10 -07:00
Colin Cross
00caec196a Revert "Merge "Revert "Add NeuralNetworks HAL v1.3"" am: f5f487be03 am: 176c4afae7 am: a163c720ed"
This reverts commit 23405c1565.

Reason for revert: revert of a cherry-pick broke master

Change-Id: I2f5d1a66c12509440293c7b5916c337ff1bbe88c
2019-10-10 22:58:01 +00:00
Lev Proleev
23405c1565 Merge "Revert "Add NeuralNetworks HAL v1.3"" am: f5f487be03 am: 176c4afae7 am: a163c720ed
am: ddc799744d

Change-Id: Iada764ac0a62f8130dd70623bc13912ba9483e54
2019-10-10 14:54:24 -07:00
Steven Moreland
bf4fd54cee mainline_system: libhwbinder/libhidltransport
Bug: 135686713
Test: artifact whitelist requirement no longer complaining
Change-Id: Ia142f8e67c31f66f86386b65e009d4faee502c11
Merged-In: Ia142f8e67c31f66f86386b65e009d4faee502c11
2019-10-10 19:51:46 +00:00
Lev Proleev
a163c720ed Merge "Revert "Add NeuralNetworks HAL v1.3"" am: f5f487be03
am: 176c4afae7

Change-Id: Ia864ea8826543b42990f3af4f7b2915c1363b36f
2019-10-10 07:26:49 -07:00
Lev Proleev
176c4afae7 Merge "Revert "Add NeuralNetworks HAL v1.3""
am: f5f487be03

Change-Id: Iaa860c79d101168b73c8ee867c3259758fbffc6d
2019-10-10 07:20:00 -07:00
Lev Proleev
f5f487be03 Merge "Revert "Add NeuralNetworks HAL v1.3"" 2019-10-10 14:06:42 +00:00
Lev Proleev
f1cec4b4a4 Revert "Add NeuralNetworks HAL v1.3"
This reverts commit bace8c091c.

Reason for revert: the topic breaks git_qt-dev-plus-aosp

Change-Id: Idf87926dd40b56b9d6acc2e207be785463f6830a
2019-10-10 13:54:21 +00:00
Lev Proleev
165a75575f Merge "Add NeuralNetworks HAL v1.3" am: 4b49e75a40
am: 5195c4cf99

Change-Id: I24075ca160667b2edfdd0465fbae25857f35235a
2019-10-10 05:20:52 -07:00
Lev Proleev
5195c4cf99 Merge "Add NeuralNetworks HAL v1.3"
am: 4b49e75a40

Change-Id: I62a994d9f8eec83e42623836b9eed269b889f2a3
2019-10-10 05:07:25 -07:00
Lev Proleev
4b49e75a40 Merge "Add NeuralNetworks HAL v1.3" 2019-10-10 10:25:21 +00:00
Steven Moreland
1d2c1bf212 Merge "mainline_system: libhwbinder/libhidltransport" 2019-10-09 17:25:43 +00:00
Steven Moreland
3dbd647da5 mainline_system: libhwbinder/libhidltransport
Bug: 135686713
Test: artifact whitelist requirement no longer complaining
Change-Id: Ia142f8e67c31f66f86386b65e009d4faee502c11
2019-10-09 12:28:24 +00:00
Harpreet "Eli" Sangha
a0e253ef0e Add Vibrator HAL 1.4
Test: Build
Change-Id: I8de47f2914cd89a0521c520504ff0dc8000205df
Signed-off-by: Harpreet \"Eli\" Sangha <eliptus@google.com>
2019-10-09 13:49:17 +09:00
David Anderson
c24146981a Merge "Add IBootControl HAL 1.1." am: a8b633d181
am: 0c61e14227

Change-Id: I62d2a316ce3586e856c0b42ac9534596436643f3
2019-10-08 12:35:17 -07:00
David Anderson
0c61e14227 Merge "Add IBootControl HAL 1.1."
am: a8b633d181

Change-Id: Ia78800744ef04a877b062631cc3444f29d9a35bd
2019-10-08 12:28:49 -07:00
David Anderson
a8b633d181 Merge "Add IBootControl HAL 1.1." 2019-10-08 19:03:05 +00:00
Lev Proleev
bace8c091c Add NeuralNetworks HAL v1.3
Bug: 139120468
Test: m check-vndk-list
Test: m
Change-Id: Id1baae2c00a38e5327ab144db76189f53bcb04cf
Merged-In: Id1baae2c00a38e5327ab144db76189f53bcb04cf
(cherry picked from commit fde53f4e3e)
2019-10-08 16:57:59 +01:00
David Anderson
b9e8d8cac8 Add IBootControl HAL 1.1.
Bug: 138861550
Test: m check-vndk-list
Test: m
Change-Id: If09d031e5acf1178fce942526782a41426c5180b
Merged-In: If09d031e5acf1178fce942526782a41426c5180b
2019-10-07 17:13:11 -07:00
David Anderson
fe1523d068 Add IBootControl HAL 1.1.
Bug: 138861550
Test: m check-vndk-list
Test: m
Change-Id: If09d031e5acf1178fce942526782a41426c5180b
2019-10-07 13:53:57 -07:00
Nikita Ioffe
1c8a111a0b Merge "Unconditionally install shim apex on system partition" am: 42b2b54c2b am: e542a799c8 am: 1faa3ffe94
am: 50196498d6

Change-Id: If3663f1d5e0523eff3255c8a3a06fb21ea454b5a
2019-10-07 09:14:51 -07:00
Nikita Ioffe
1faa3ffe94 Merge "Unconditionally install shim apex on system partition" am: 42b2b54c2b
am: e542a799c8

Change-Id: I112f4eb54236c7bb636b1ea5243c892deb0b7243
2019-10-07 08:42:10 -07:00
Nikita Ioffe
e542a799c8 Merge "Unconditionally install shim apex on system partition"
am: 42b2b54c2b

Change-Id: I303417bee4f5143abfda29eadfb997203c0cb168
2019-10-07 08:36:15 -07:00
Nikita Ioffe
42b2b54c2b Merge "Unconditionally install shim apex on system partition" 2019-10-07 15:10:10 +00:00
Anton Hansson
2c5def62dc Disable vendor path check for mainline variants
This matches what is done for mainline_system_arm64
(in this particular branch).

Test: lunch mainline_system_x86 && m nothing
Change-Id: I4eb236d086bd36b4821ed11411fa404f2d45f2b9
Merged-In: I607781ce7c6299cbc98c54c683d04db3b65c2e21
2019-10-07 13:51:33 +01:00
Nikita Ioffe
b6eeae7289 Unconditionally install shim apex on system partition
Trying to do it on per-device basis is prone to errors and already
bitten us several times. For example, currently aosp_taimen doesn't
install shim apex on system partition, but specifies
ro.apex.updatable = "true", which means that it doesn't pass CTS tests.

Unconditionally installing shim APEX shouldn't introduce any problems
since apexd will skip its activation of devices that don't support
updatable APEX.

Test: m checkbuild
Bug: 140957666
Change-Id: I6b5e668b40b97752295c831684a7291842533c40
2019-10-07 12:14:08 +01:00
Yo Chiang
aa7a61d0c9 Merge "Clean up mainline whitelist in aosp_product.mk" am: 8ca4bf76d6 am: c4ca72d8e9 am: de7d8b19b6
am: 42127e0213

Change-Id: I7a676239700cc1cbd5a496392328523bc98add36
2019-10-07 03:54:46 -07:00
Roland Levillain
fe4671d8f9 Merge "Introduce build variable OVERRIDE_TARGET_FLATTEN_APEX." am: 81681abfef am: 0a24633ef5 am: 6a3e54b47f
am: 824989bee6

Change-Id: Iaeb8684bf93e3d277239958d3b8086f0e855d0f5
2019-10-07 03:53:30 -07:00