Commit graph

55914 commits

Author SHA1 Message Date
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
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
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
e1b039eb54 Merge "Call delta_generator to get the signature size"
am: 3654beb83d

Change-Id: I29743d04e0f39d56cc7760677f6ff665579ccfe2
2019-10-15 10:14:01 -07:00
Tianjie Xu
3654beb83d Merge "Call delta_generator to get the signature size" 2019-10-15 16:49:15 +00:00
Jerome Gaillard
a0171af06f Allow files generated by droidstubs to be copied in the SDK
We need to get files generated by a droidstubs target into the SDK. So
we first copy them into the out/target/common/obj/PACKAGING folder where
they can be picked up by the SDK build.

Bug: 142480924
Test: m sdk
Change-Id: I7a0b22907603e1d17ac05901ee7f8bb9cff89f7f
2019-10-15 17:27:43 +01: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
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
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
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
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
Tianjie Xu
21e6deb647 Call delta_generator to get the signature size
The signature size is needed during payload hashing and signing.
We used to sign the update_engine's payload with RSA keys only. In
this case, the signature size always equals the key size. But the
assumption is no longer true for EC keys, whose DER-encoded signature
size is a variant with a maximum size.

Therefore, we always give the maximum signature size to the delta
generator, who then add paddings to the real signature if necessary.
The maximum signature size is calculated by calling the delta_generator
with the new option '--calculate_signature_size'. For custom payload
signers, we also deprecate the '--payload_signer_key_size' and replace
it with '--payload_signer_maximum_signature_size'.

The EC key in the test is generated with:
The EC key in the unittest is generated with the command:
openssl ecparam -name prime256v1 -genkey -noout -out prime256v1-key.pem
openssl pkey -in prime256v1-key.pem -out testkey_EC.key

Bug: 141244025
Test: sign and verify a payload
Change-Id: Ife6e269d8aa3d870405aca20086330f1795e167f
2019-10-12 00:36:54 +00:00
Evgenii Stepanov
eb3ade924b Define ro.sanitize.<name> properties in SANITIZE_TARGET builds.
This will let us quickly check the system image build type,
and modify *.rc behavior based on that.

Bug: 142430632
Test: adb shell getprop ro.sanitize.hwaddress in hwasan build

Change-Id: If2eb99dee93f0652cada5cb2e02fda963d00a7eb
2019-10-11 16:59:27 -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
Tao Bao
afd92a8689 releasetools: Set the search path based on the current executable.
We used to mimic the behavior of build system, to find the default
search path based on OUT_DIR_COMMON_BASE or OUT_DIR. These variables
should be internal to build system.

Since we've switched releasetools script to hermetic Python executables
(e.g. `m -j ota_from_target_files`, then run the binary at
`out/host/linux-x86/bin/ota_from_target_files`), we can set the search
path in relative to the path of the current executable.

Bug: 133126366
Test: TreeHugger
Test: 1. Build aosp_x86, by "lunch aosp_x86; m -j"
      2. Inject errors to the executables under out/host/linux-x86/bin,
         e.g.  to `lpmake`.
      3. Set up OUT_DIR (e.g., to /tmp/out) and build the same product
         again by "export OUT_DIR=/tmp/out; lunch aosp_x86; m -j". Check
         that the second run finishes successfully (with the binaries at
         /tmp/out as opposed to out/; otherwise it would fail the build
         due to the invalid binaries from step 2).
Test: lunch a target;
      `atest --host releasetools_test releasetools_py3_test`
Change-Id: I366099c3dfd5fa4282745ef258a8cf35338e1e42
2019-10-11 08:53:41 -07:00
Colin Cross
30124b4e1e Merge "Remove stray ZIPALIGN_PAGE_ALIGN_FLAGS"
am: d6d27517f7

Change-Id: I6bd69722e8f5fa9b1333b9dc9e374e255d11e234
2019-10-11 06:20:52 -07:00
Victor Chang
d272f0ed6f Add libicu_jni into ART APEX
Bug: 138994281
Test: device boots
Change-Id: Ic61d374ef87634ebaa1bb55b2a36176d3606f3d2
2019-10-11 14:20:38 +01:00
Treehugger Robot
d6d27517f7 Merge "Remove stray ZIPALIGN_PAGE_ALIGN_FLAGS" 2019-10-11 13:12:29 +00:00
dianlujitao
eec39a95f3 Merge "Fix odm output directory for devices w/o vendor partition"
am: 46cfab96d8

Change-Id: Ia132212a1b1cfb909a3f8539ca42af0bdd9c9939
2019-10-11 04:14:06 -07:00
Treehugger Robot
46cfab96d8 Merge "Fix odm output directory for devices w/o vendor partition" 2019-10-11 10:46:43 +00:00
Xin Li
13c9a00e30 [automerger skipped] Merge "DO NOT MERGE - Merge QP1A.191005.007 into master"
am: 51a7d20229 -s ours
am skip reason: change_id I063f0430347d9f1e6ea5a8133204585833ed5ddc with SHA1 84633edb22 is in history

Change-Id: Id2e7eaeb1ad6dd8ad7f9d5ebaf8d4e8f5c0511e0
2019-10-10 21:19:44 -07:00
Xin Li
39124f2240 [automerger skipped] DO NOT MERGE - Merge QP1A.191005.007 into master
am: 66ec993fe5 -s ours
am skip reason: change_id I063f0430347d9f1e6ea5a8133204585833ed5ddc with SHA1 84633edb22 is in history

Change-Id: I794691b6e2f321e6073be08803291871cd2c414c
2019-10-10 21:10:46 -07:00
Xin Li
51a7d20229 Merge "DO NOT MERGE - Merge QP1A.191005.007 into master" 2019-10-11 02:56:40 +00:00
Elliott Hughes
af11c50e67 Revert "-D__ANDROID_NDK__ for SDK builds."
This reverts commit 401a84071b.

Reason for revert: fixed in bionic instead (https://android-review.googlesource.com/c/platform/bionic/+/1135146).

Change-Id: I85e2ef241684c34fc968fd0e7230b8a88ea3209a
2019-10-11 01:24:39 +00:00
Harpreet "Eli" Sangha
4a27b4e3fe Merge "Add Vibrator HAL 1.4"
am: 0ffe0c6248

Change-Id: Icc4968fb4f33b173484c5e3ecc028b65fcb0279f
2019-10-10 17:43:10 -07:00
Treehugger Robot
0ffe0c6248 Merge "Add Vibrator HAL 1.4" 2019-10-11 00:35:05 +00:00
Xin Li
66ec993fe5 DO NOT MERGE - Merge QP1A.191005.007 into master
Bug: 142297020
Merged-In: I063f0430347d9f1e6ea5a8133204585833ed5ddc
Change-Id: I6fe9ad3f71b30ba7c1cf9d6941450809cfc66909
2019-10-10 22:54:06 +00:00
Tao Bao
97c1c9aaa3 Merge "AVB: decouple vbmeta.img from recovery.img for non-A/B devices"
am: 549325427b

Change-Id: Iebb05accc055147051cfecfc2729fbe8cca0a0d1
2019-10-10 13:38:13 -07:00
Tao Bao
549325427b Merge "AVB: decouple vbmeta.img from recovery.img for non-A/B devices" 2019-10-10 20:18:35 +00:00
Josh Gao
5f96f5ce35 Move remount to PRODUCT_PACKAGES_DEBUG.
required seems to conflict with apex with the following error:

    build/make/core/main.mk:1338: warning: build/make/target/product/aosp_x86_64.mk produces files inside build/make/target/product/mainline_system.mks artifact path requirement.

Test: treehugger
Change-Id: Ifb1072b4585a94355909b33e3b8129455c35714a
2019-10-10 13:12:13 -07:00