Commit Graph

56105 Commits

Author SHA1 Message Date
Pete Gillin
3092dfb2bb Merge "Enable Java language level 9 by default." am: 3e25573c13
am: 77a7d014b2

Change-Id: I7b9d57a367b23d9b5b63340d28d5fb7d02551c37
2019-10-17 04:12:12 -07:00
Pete Gillin
77a7d014b2 Merge "Enable Java language level 9 by default."
am: 3e25573c13

Change-Id: I6190f392ef5664fd738221b18b367d2255fb4737
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
Tao Bao
eebc3ed5c7 Merge "releasetools: Fix an issue in common.GetAvbPartitionArg." am: 323a460d5b
am: e54c3c3781

Change-Id: Ida81692cb2ece9e699dd5d8b4a1a9bb2e8714a68
2019-10-16 14:20:12 -07:00
Tao Bao
e54c3c3781 Merge "releasetools: Fix an issue in common.GetAvbPartitionArg."
am: 323a460d5b

Change-Id: I2cd550847a7aceeae04e83600fe0e79cd82e6a14
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
Adam Seaton
ca48a912ce Merge "Update OWNERS for version_defaults.mk with pscovanner & lubomir Bug: 141272605" into qt-dev am: 5d0a024d7b
am: 479c9c549b

Change-Id: I9ce6c70da168cb87a8106dbb0da76aac2f0e9902
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

Change-Id: I4cab91199cbd9bef8c44ff2570558f18d99afaaa
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

Change-Id: I2f9874a0189c58dd6be00aa947a7a821ad5f77cf
2019-10-16 09:21:27 -07:00
Elliott Hughes
c0afb1cd6b Merge "Revert "-D__ANDROID_NDK__ for SDK builds.""
am: be90dc8396

Change-Id: Ica8f2437caa57213889289a60061d96219e6bf39
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
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

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
Tianjie Xu
d4c687065e Merge "Call delta_generator to get the signature size" am: 3654beb83d
am: e1b039eb54

Change-Id: I8584b5e799b5a45323736751defbdc328e6a8b8a
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

Change-Id: Iaf34f97a5b4299b470ff12e37b99db690a964928
2019-10-15 10:35:12 -07:00
vichang
7bcad8fc4b Merge "Add libicu_jni into ART APEX" am: ed02064ed5
am: bc2a8ead4a

Change-Id: I2d993aa78057705462fe3d0ce1d57072d3f0b446
2019-10-15 10:32:11 -07:00
Inseob Kim
9784bca489 Merge "Add BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW" am: 491f2969d6
am: 7c4ef3b945

Change-Id: Ica9ca4038f8544790882ecbf9c8991e0a4b4721b
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

Change-Id: I7d2db19b6e80a249033fb6a63af7c3a75d3e6dc7
2019-10-15 10:25:23 -07:00
Tianjie Xu
e1b039eb54 Merge "Call delta_generator to get the signature size"
am: 3654beb83d

Change-Id: I29743d04e0f39d56cc7760677f6ff665579ccfe2
2019-10-15 10:14:01 -07:00
Xin Li
a0918e19a2 DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
am: 9bb4767ad7

Change-Id: Id7419a7ff06814bec72a080817a45fbc072bd478
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

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
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

Change-Id: If4e6f02703ec50858d7cbf27b790fbb35ed59f8e
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
Inseob Kim
7c4ef3b945 Merge "Add BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW"
am: 491f2969d6

Change-Id: Icf9c9d60e7d2532e37edde2d6b2e65b63013be48
2019-10-14 18:54:55 -07:00
Inseob Kim
491f2969d6 Merge "Add BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW" 2019-10-15 01:29:06 +00:00
Tao Bao
3612c88ed7 releasetools: Fix an issue in common.GetAvbPartitionArg.
It's a bug introduced in commit 1aeef725a7, which affects unittest only.

Bug: 130351427
Test: Use a lunch'd target. Run
      `atest --host releasetools_test releasetools_py3_test`.
Change-Id: I7ff01a6af47d002e1203bd376d477b60d769cbd1
2019-10-14 17:53:21 -07:00
TreeHugger Robot
f0b4aaa83b Merge "DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master" into stage-aosp-master 2019-10-15 00:24:21 +00:00
Inseob Kim
bc89619724 Add BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW
A new sysprop neverallow rules are mandatory only for devices launching
with R or later. For devices already launched, neverallow rules can be
relaxed with adding following line to BoardConfig.mk:

BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW := true

Bug: 131162102
Test: Set PRODUCT_SHIPPING_API_LEVEL := 30 and try building with
changing some system_public_prop to system_internal_prop
Test: m cts sepolicy_tests

Change-Id: I44a83af19b18b4116f83a3d5dc929f28bb8870ce
Merged-In: I44a83af19b18b4116f83a3d5dc929f28bb8870ce
(cherry picked from commit 06fb4554f4)
2019-10-15 09:24:17 +09:00
Xin Li
9bb4767ad7 DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
Bug: 141248619
Change-Id: I238167158c381b1726628da0617bb6eda33dd9b9
2019-10-14 22:52:58 +00:00
Tao Bao
56d16c0b4a Merge "releasetools: Set the search path based on the current executable." am: 21fb765515
am: c7e348066a

Change-Id: I7be0d9630237354d8bc0da43be6a44fe7b190d99
2019-10-14 15:42:15 -07:00
Tao Bao
c7e348066a Merge "releasetools: Set the search path based on the current executable."
am: 21fb765515

Change-Id: I04d05e2b9325877d3477c655b7d089cc4d815a5e
2019-10-14 15:35:16 -07:00
Tao Bao
21fb765515 Merge "releasetools: Set the search path based on the current executable." 2019-10-14 22:20:02 +00:00
Evgenii Stepanov
1c0eab294a Merge "Define ro.sanitize.<name> properties in SANITIZE_TARGET builds." am: 7bebcbaff2
am: 62c3058fc9

Change-Id: Id7baede562c242d965f7f0fa71ec662f52307ac0
2019-10-14 15:14:28 -07:00
Evgenii Stepanov
62c3058fc9 Merge "Define ro.sanitize.<name> properties in SANITIZE_TARGET builds."
am: 7bebcbaff2

Change-Id: I1f0311fded467e0dd4538e0b461f1669d62d3b3e
2019-10-14 15:00:56 -07:00
Evgenii Stepanov
7bebcbaff2 Merge "Define ro.sanitize.<name> properties in SANITIZE_TARGET builds." 2019-10-14 21:44:09 +00:00
Tao Bao
a824e907e5 Merge "Include per-partition fingerprint as AVB prop." am: dc2f0b0abd
am: 48ccb46f5f

Change-Id: Ia754f2cc68814ed0155d16d111eed42cad41856a
2019-10-14 08:20:47 -07:00
Tao Bao
48ccb46f5f Merge "Include per-partition fingerprint as AVB prop."
am: dc2f0b0abd

Change-Id: Iba6609e92a1b2b7bde8564cbfc5fa59fb8a69935
2019-10-14 08:15:26 -07:00
Tao Bao
dc2f0b0abd Merge "Include per-partition fingerprint as AVB prop." 2019-10-14 14:53:46 +00:00
Anton Hansson
2ce82aea1a Merge "Document SYSTEM_OTHER_ODEX_FILTER matching" am: 3cc4fa6394
am: bde786ca70

Change-Id: Ia10a14e43e24bb19985631275fb43bbb497521d3
2019-10-14 02:45:57 -07:00
Anton Hansson
bde786ca70 Merge "Document SYSTEM_OTHER_ODEX_FILTER matching"
am: 3cc4fa6394

Change-Id: I6e243dc057ce23913a9a33f97a7ecd35c9714de1
2019-10-14 02:40:35 -07:00
Anton Hansson
3cc4fa6394 Merge "Document SYSTEM_OTHER_ODEX_FILTER matching" 2019-10-14 09:29:10 +00: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