Lev Proleev
41cdfcc1fc
[automerger skipped] Merge "Add NeuralNetworks HAL v1.3" am: 44eea14988
...
am: 49cd5afa8ee4f453394b
2019-10-17 16:12:04 -07:00
Lev Proleev
49cd5afa8e
Merge "Add NeuralNetworks HAL v1.3"
...
am: 44eea14988
2019-10-17 15:59:50 -07:00
Treehugger Robot
44eea14988
Merge "Add NeuralNetworks HAL v1.3"
2019-10-17 22:47:15 +00:00
Tianjie Xu
50fa4907cd
Merge "Stop creating update_engine_payload_key" am: 526b8563a5
...
am: 7a3304a0a4
2019-10-17 14:15:40 -07:00
Tianjie Xu
7a3304a0a4
Merge "Stop creating update_engine_payload_key"
...
am: 526b8563a5
2019-10-17 14:09:39 -07:00
Tianjie Xu
526b8563a5
Merge "Stop creating update_engine_payload_key"
2019-10-17 20:59:51 +00:00
Mikhail Naganov
46d240e6e5
Merge "Add libaudiohal to mainline system image" am: b410d98c0a
...
am: 4c086e7be7
2019-10-17 13:45:47 -07:00
Mikhail Naganov
4c086e7be7
Merge "Add libaudiohal to mainline system image"
...
am: b410d98c0a
2019-10-17 13:39:48 -07:00
Treehugger Robot
b410d98c0a
Merge "Add libaudiohal to mainline system image"
2019-10-17 20:23:21 +00:00
Josh Gao
ee0756bade
Merge "Move remount to PRODUCT_PACKAGES_DEBUG." am: 7228fcf19a
...
am: 0ad32182a0
2019-10-17 13:23:18 -07:00
Josh Gao
0ad32182a0
Merge "Move remount to PRODUCT_PACKAGES_DEBUG."
...
am: 7228fcf19a
2019-10-17 13:15:00 -07:00
Mikhail Naganov
4fc7e410fc
Add libaudiohal to mainline system image
...
32-bit libaudiohal is used by 3rd party modules on the system
partition which get loaded by client apps. In the long term,
this dependency has to be eliminated, see b/142811260.
Bug: 141989952
Bug: 142811260
Test: vendor/google/build/build_test.bash
Merged-In: I41241922c7e48c5d8bf95363944932569cb20c0a
Change-Id: I41241922c7e48c5d8bf95363944932569cb20c0a
2019-10-17 12:36:42 -07:00
Josh Gao
7228fcf19a
Merge "Move remount to PRODUCT_PACKAGES_DEBUG."
2019-10-17 19:14:26 +00:00
Jooyung Han
67d3695964
Merge "Revert "install VNDK APEX instead of VNDK libs"" am: e925923af3
...
am: 7701ecb0a4
2019-10-17 05:19:01 -07:00
Jooyung Han
7701ecb0a4
Merge "Revert "install VNDK APEX instead of VNDK libs""
...
am: e925923af3
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
Pete Gillin
3092dfb2bb
Merge "Enable Java language level 9 by default." am: 3e25573c13
...
am: 77a7d014b2
2019-10-17 04:12:12 -07:00
Pete Gillin
77a7d014b2
Merge "Enable Java language level 9 by default."
...
am: 3e25573c13
2019-10-17 04:05:13 -07:00
Pete Gillin
3e25573c13
Merge "Enable Java language level 9 by default."
2019-10-17 10:38:35 +00:00
Jooyung Han
376c613085
Revert "install VNDK APEX instead of VNDK libs"
...
This reverts commit 172c8e6de0
2019-10-16 23:45:38 +00:00
Tao Bao
eebc3ed5c7
Merge "releasetools: Fix an issue in common.GetAvbPartitionArg." am: 323a460d5b
...
am: e54c3c3781
2019-10-16 14:20:12 -07:00
Tao Bao
e54c3c3781
Merge "releasetools: Fix an issue in common.GetAvbPartitionArg."
...
am: 323a460d5b
2019-10-16 14:14:18 -07:00
Treehugger Robot
323a460d5b
Merge "releasetools: Fix an issue in common.GetAvbPartitionArg."
2019-10-16 20:52:19 +00:00
Tianjie Xu
2df23d7f41
Stop creating update_engine_payload_key
...
Now the update_engine is able to read public keysfrom otacerts directly.
So the update_engine_payload_key is no longer needed.
Also remove the key replace in sign_target_files_apks.py. So we should
not use the new script to sign the old target files.
Bug: 116660991
Test: build the system image, unit tests pass
Change-Id: I9dae1f8b397f2b5efafed66a8faac1cb9087c741
2019-10-16 18:27:22 +00:00
Adam Seaton
ca48a912ce
Merge "Update OWNERS for version_defaults.mk with pscovanner & lubomir Bug: 141272605" into qt-dev am: 5d0a024d7b
...
am: 479c9c549b
2019-10-16 11:24:29 -07:00
Adam Seaton
479c9c549b
Merge "Update OWNERS for version_defaults.mk with pscovanner & lubomir Bug: 141272605" into qt-dev
...
am: 5d0a024d7b
2019-10-16 11:18:30 -07:00
TreeHugger Robot
5d0a024d7b
Merge "Update OWNERS for version_defaults.mk with pscovanner & lubomir Bug: 141272605" into qt-dev
2019-10-16 17:58:38 +00:00
Elliott Hughes
217920cb47
Merge "Revert "-D__ANDROID_NDK__ for SDK builds."" am: be90dc8396
...
am: c0afb1cd6b
2019-10-16 09:21:27 -07:00
Elliott Hughes
c0afb1cd6b
Merge "Revert "-D__ANDROID_NDK__ for SDK builds.""
...
am: be90dc8396
2019-10-16 09:14:11 -07:00
Elliott Hughes
be90dc8396
Merge "Revert "-D__ANDROID_NDK__ for SDK builds.""
2019-10-16 16:01:14 +00:00
Lev Proleev
d67cdd3bd2
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-16 14:00:40 +01:00
Pete Gillin
b455f58059
Enable Java language level 9 by default.
...
This changes the default Java language level from 8 to 9, i.e. javac
invocations now use -source 1.9 -target 1.9.
The environment variable EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=false is
added to switch back to the language level 8 behaviour. (Previously,
setting that variable to true was required to opt in to language level
9.)
Test: make droid java tests cts docs
Test: javap -v <some class file in output> | grep 'major version' (reports 53, for classes from 'benchmarks' which is in Android.bp and 'ahat' which is in Android.mk)
Test: make RunBluetoothRoboTests RunCarSettingsLibRoboTests (two main flavours of robolectric)
Test: make cts && cts-tradefed help
Test: atest CtsLibcoreTestCases (reasonably low-level device tests)
Test: atest CtsHostTzDataTests (arbitrary host test)
Bug: 115604102
Change-Id: I06c4adb3861db82f4804ac9322a131067f395b4e
Merged-In: I13b2ff61c6423ad99464e0a4d2b1bedfd8ae1080
2019-10-16 11:21:20 +01:00
Martin Brabham
b709c612db
Merge changes Ie9de9576,I14f7cd06 am: 14fcfb8a9a
...
am: a42177adc4
2019-10-15 15:21:34 -07:00
Martin Brabham
a42177adc4
Merge changes Ie9de9576,I14f7cd06
...
am: 14fcfb8a9a
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
Tianjie Xu
d4c687065e
Merge "Call delta_generator to get the signature size" am: 3654beb83d
...
am: e1b039eb54
2019-10-15 11:18:18 -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
2019-10-15 10:35:12 -07:00
vichang
7bcad8fc4b
Merge "Add libicu_jni into ART APEX" am: ed02064ed5
...
am: bc2a8ead4a
2019-10-15 10:32:11 -07:00
Inseob Kim
9784bca489
Merge "Add BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW" am: 491f2969d6
...
am: 7c4ef3b945
2019-10-15 10:26:18 -07:00
Xin Li
5bc1fea8e8
Merge "DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master" into stage-aosp-master
...
am: f0b4aaa83b
2019-10-15 10:25:23 -07:00
Tianjie Xu
e1b039eb54
Merge "Call delta_generator to get the signature size"
...
am: 3654beb83d
2019-10-15 10:14:01 -07:00
Xin Li
a0918e19a2
DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
...
am: 9bb4767ad7
2019-10-15 10:10:10 -07:00
Tianjie Xu
3654beb83d
Merge "Call delta_generator to get the signature size"
2019-10-15 16:49:15 +00:00
Jooyung Han
97684d7a89
Merge "install VNDK APEX instead of VNDK libs"
...
am: 75d8a47039
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
Inseob Kim
3b82e07023
Do not initialize BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW
...
BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW is meant to be set depending on
targets, not devices. This allows that value to be set outside
BoardConfig.mk.
Bug: 131162102
Bug: 142684203
Test: m sepolicy_tests
Change-Id: I14f7cd06dcbaf1b5354c648079a815d7b6cc6f3a
2019-10-15 17:24:35 +09:00
vichang
bc2a8ead4a
Merge "Add libicu_jni into ART APEX"
...
am: ed02064ed5
2019-10-15 01:09:54 -07:00
vichang
ed02064ed5
Merge "Add libicu_jni into ART APEX"
2019-10-15 06:43:10 +00:00
