Commit Graph

57635 Commits

Author SHA1 Message Date
Yifan Hong
fccbf585ad Merge changes from topic "dap_size_check_python" am: bfcfa8c18f am: 7441a6bbe2
am: 9828532115

Change-Id: I0dd0872e98bf437747417a35a91425dd52e8ad0a
2019-11-05 11:24:05 -08:00
Inseob Kim
6442896aa9 Merge "Fix and generate vndk snapshot entirely in Soong" am: db49de8560 am: 8817894034
am: c56a94bd7f

Change-Id: I06d35f71cbc36b7e773eb0110efd327fe562c648
2019-11-05 10:43:46 -08:00
Yifan Hong
9828532115 Merge changes from topic "dap_size_check_python" am: bfcfa8c18f
am: 7441a6bbe2

Change-Id: Ic9268e957a71cb51806c35f5860e3f4f54582a48
2019-11-05 10:23:20 -08:00
Yifan Hong
7441a6bbe2 Merge changes from topic "dap_size_check_python"
am: bfcfa8c18f

Change-Id: Ibad4c2c60de81a61abda4ef9bb4c1cf133cc5ee7
2019-11-05 10:15:18 -08:00
Yifan Hong
bfcfa8c18f Merge changes from topic "dap_size_check_python"
* changes:
  Skip checking vendor partition size on AOSP targets
  Reland "Move partition size checks to python script"
2019-11-05 17:53:39 +00:00
Inseob Kim
c56a94bd7f Merge "Fix and generate vndk snapshot entirely in Soong" am: db49de8560
am: 8817894034

Change-Id: I8f503a77d4ff71f83bb062badc3264c4f9de0332
2019-11-05 01:09:37 -08:00
Inseob Kim
8817894034 Merge "Fix and generate vndk snapshot entirely in Soong"
am: db49de8560

Change-Id: I7c160d3937be07eb14989f774a8a62a3e8a49a6f
2019-11-04 20:12:48 -08:00
Treehugger Robot
db49de8560 Merge "Fix and generate vndk snapshot entirely in Soong" 2019-11-05 03:48:51 +00:00
Colin Cross
7bf1fa727e Merge "Use system modules for turbine in Make" am: dd386dc9ac am: 38c5b43bb3
am: 3813e721cb

Change-Id: Ie5cafd26285d51a8a5218f9257f2c104029d7066
2019-11-04 11:30:51 -08:00
Colin Cross
3813e721cb Merge "Use system modules for turbine in Make" am: dd386dc9ac
am: 38c5b43bb3

Change-Id: I6bd912b08f0b94dff304930022fa523da5ecb632
2019-11-04 11:23:49 -08:00
Colin Cross
38c5b43bb3 Merge "Use system modules for turbine in Make"
am: dd386dc9ac

Change-Id: I07d373a5161e760b9910eb98d8f4dd05cbdb7159
2019-11-04 11:17:49 -08:00
Colin Cross
dd386dc9ac Merge "Use system modules for turbine in Make" 2019-11-04 18:54:32 +00:00
Ulyana Trafimovich
4cb3365e34 Merge "Disable dexpreopt on targets that do not include default ART config." am: 6dc79ada3d am: fba1b6ae33
am: 5e16d6a7b1

Change-Id: I46a7e91db2bf9e8319c278fec91e428478a62bc8
2019-11-04 04:32:01 -08:00
Ulyana Trafimovich
5e16d6a7b1 Merge "Disable dexpreopt on targets that do not include default ART config." am: 6dc79ada3d
am: fba1b6ae33

Change-Id: I91e8ef141ab9cfcd39441b53b77dc65e81ab8863
2019-11-04 04:26:30 -08:00
Anton Hansson
d5b66471b6 Merge "Ensure current product use PRODUCT_* vars directly" am: 871d39c40e am: 331fb4f7d6
am: 1def48dd5e

Change-Id: I4a5f13a9161b8da766077452a3309a5dffab629c
2019-11-04 04:23:34 -08:00
Jiyong Park
0d583c8379 Merge "Avoid path conflicts for the notice files" am: 479cc84706 am: 9c792a81ea
am: 29e4500e91

Change-Id: I102bfe07bb7d9936a160ed2edec22d62b6cb674c
2019-11-04 04:21:10 -08:00
Ulyana Trafimovich
fba1b6ae33 Merge "Disable dexpreopt on targets that do not include default ART config."
am: 6dc79ada3d

Change-Id: Iff64081fba52c767fa7a0a03fd1b424eebbce577
2019-11-04 04:19:58 -08:00
Anton Hansson
1def48dd5e Merge "Ensure current product use PRODUCT_* vars directly" am: 871d39c40e
am: 331fb4f7d6

Change-Id: Ibc79392e7760082bef5ae4406c210572e52f92a9
2019-11-04 04:17:51 -08:00
Jiyong Park
29e4500e91 Merge "Avoid path conflicts for the notice files" am: 479cc84706
am: 9c792a81ea

Change-Id: I5a5621aa8a6146d8fcb21f8f67bb0dc8e7d19007
2019-11-04 04:15:17 -08:00
Anton Hansson
331fb4f7d6 Merge "Ensure current product use PRODUCT_* vars directly"
am: 871d39c40e

Change-Id: I2ac946500a07f8ee464d32d9a8fd9a558febdf1f
2019-11-04 04:12:14 -08:00
Jiyong Park
9c792a81ea Merge "Avoid path conflicts for the notice files"
am: 479cc84706

Change-Id: I194cf736ca9e1a653f06d52f767f93788808b53b
2019-11-04 04:08:24 -08:00
Ulyana Trafimovich
6dc79ada3d Merge "Disable dexpreopt on targets that do not include default ART config." 2019-11-04 12:04:04 +00:00
Anton Hansson
871d39c40e Merge "Ensure current product use PRODUCT_* vars directly" 2019-11-04 10:35:48 +00:00
Jiyong Park
479cc84706 Merge "Avoid path conflicts for the notice files" 2019-11-04 09:46:42 +00:00
Yo Chiang
07bc8f5ba5 [automerger skipped] Merge "Bump PRODUCT_SHIPPING_API_LEVEL to 29 for CSI" am: 27fe9add1d -s ours am: efdd1abdf6 -s ours
am: e790c86a9a -s ours
am skip reason: change_id Iee2ac89586d71d9ab3bb257f2b3b1073710554d5 with SHA1 670e6d74aa is in history

Change-Id: Ic6c306d3b9555af683288670ced6c16997b78b20
2019-11-03 21:15:38 -08:00
Yo Chiang
e790c86a9a [automerger skipped] Merge "Bump PRODUCT_SHIPPING_API_LEVEL to 29 for CSI" am: 27fe9add1d -s ours
am: efdd1abdf6 -s ours
am skip reason: change_id Iee2ac89586d71d9ab3bb257f2b3b1073710554d5 with SHA1 670e6d74aa is in history

Change-Id: I7d2431e25b7703e5e4c4f16fbebd3898544ef795
2019-11-03 21:10:07 -08:00
Yo Chiang
efdd1abdf6 [automerger skipped] Merge "Bump PRODUCT_SHIPPING_API_LEVEL to 29 for CSI"
am: 27fe9add1d -s ours
am skip reason: change_id Iee2ac89586d71d9ab3bb257f2b3b1073710554d5 with SHA1 670e6d74aa is in history

Change-Id: I8df1e5dd0f1033b46aea07552f8f42a08eb0e7ca
2019-11-03 21:03:44 -08:00
Treehugger Robot
27fe9add1d Merge "Bump PRODUCT_SHIPPING_API_LEVEL to 29 for CSI" 2019-11-04 04:48:12 +00:00
Yi-yo Chiang
5629c56fde [automerger skipped] Merge "Bump PRODUCT_SHIPPING_API_LEVEL to 29 for CSI" into stage-aosp-master am: d24005d853 -s ours
am: 8e93a052b0 -s ours
am skip reason: change_id Iee2ac89586d71d9ab3bb257f2b3b1073710554d5 with SHA1 2ccc153d42 is in history

Change-Id: Ib7856f66a5e64d4ba83ea0a9c0515c9f8424fe13
2019-11-03 20:47:03 -08:00
Yi-yo Chiang
8e93a052b0 [automerger skipped] Merge "Bump PRODUCT_SHIPPING_API_LEVEL to 29 for CSI" into stage-aosp-master
am: d24005d853 -s ours
am skip reason: change_id Iee2ac89586d71d9ab3bb257f2b3b1073710554d5 with SHA1 8c1290cbd5 is in history

Change-Id: I3e3edd83819534828039175782ea3a2c8b6bee2b
2019-11-03 20:41:28 -08:00
Yi-yo Chiang
d24005d853 Merge "Bump PRODUCT_SHIPPING_API_LEVEL to 29 for CSI" into stage-aosp-master 2019-11-04 04:26:44 +00:00
Jiyong Park
e12c862013 Avoid path conflicts for the notice files
Path conflicts could happen when following conditions are met.
1) a java library named "foo" is not installable.
2) a java library named "bar" is installable, and its stem is set to
"foo".

Then the notice file for 1) becomes foo.jar.txt following its
LOCAL_MODULE, while the notice file for 2) becomes foo.jar.txt following
its stem. Since the file for 1) is a synthetic one, the actual name
isn't important. Avoid the conflict by appending a suffix
(_non_installable, but could be anything) to the file name for 1).

There still is a chance for the conflict; if the stem for "bar" is set
to "foo_non_installable". But practically, the chances are very low.

Bug: 139391334
Bug: 143700028
Test: m
Change-Id: Id50b30774bbf65cc180baf963a95ea56fe6eb74f
2019-11-04 10:30:34 +09:00
Peter Collingbourne
93ff26406f Merge "Add support for $(TARGET_EXPERIMENTAL_MTE) in product configs." am: 227ad08281 am: 212c2696b7
am: 3211e37be9

Change-Id: I73668d325079752b3c35468ab4ee8c500c7ed62b
2019-11-01 19:25:25 -07:00
Peter Collingbourne
3211e37be9 Merge "Add support for $(TARGET_EXPERIMENTAL_MTE) in product configs." am: 227ad08281
am: 212c2696b7

Change-Id: I20f7011dc3185b5c17fc63e02030fb98029796f7
2019-11-01 19:19:18 -07:00
Peter Collingbourne
212c2696b7 Merge "Add support for $(TARGET_EXPERIMENTAL_MTE) in product configs."
am: 227ad08281

Change-Id: I2ca611f2c933509bef3756171ab319d449ad06d0
2019-11-01 19:13:51 -07:00
Peter Collingbourne
227ad08281 Merge "Add support for $(TARGET_EXPERIMENTAL_MTE) in product configs." 2019-11-02 02:00:22 +00:00
Yifan Hong
60bfcc4fac Skip checking vendor partition size on AOSP targets
AOSP targets doesn't have INSTALLED_VENDORIMAGE_TARGET defined.

Fix dump-dynamic-partitions-info to filter out vendor
from dynamic partition lists.

Then, check_partition_sizes.py reads info without vendor
in dynamic partition list for AOSP targets.

Test: forrest
Bug: 143734706

Change-Id: I788196d854c1cf3eea218d534599f8bf642120fc
2019-11-01 17:04:27 -07:00
Peter Collingbourne
784db1a741 Add support for $(TARGET_EXPERIMENTAL_MTE) in product configs.
We are bringing up support for ARM Memory Tagging Extension in the platform,
but the required patches have not yet landed in the upstream kernel. This
change adds support for a product variable that products may set to true to
declare support for an experimental userspace interface to MTE. Setting the
variable to true causes a product configuration to be enabled which will
activate code in bionic and scudo that uses the interface.

This variable should not be set to true in shipping products because
the userspace interface has not been finalized and is subject to change.
Once the support patches have landed in the kernel, bionic and scudo will
be changed to use the official interface and the variable will be removed.

Bug: 135772972
Change-Id: Ie3d2619bc09c134e0da073c65805e7ec049687e1
2019-11-01 15:33:52 -07:00
Colin Cross
f0add55066 Use system modules for turbine in Make
turbine supports taking system modules on the command line,
now that we target Java language level 1.9 and use system modules
by default switch turbine to match javac.

This is equivalent to Ieee07502151da0d5693bb8929213d495c039106b
in Soong.

Test: m java
Change-Id: Ib91c6f57b316f48f1ab819e4e1d2dc2e0ee42988
2019-11-01 13:34:46 -07:00
Yifan Hong
3a7c2ef7cc Reland "Move partition size checks to python script"
This reverts commit 0141e45b96.

Reason for revert: Fixed in follow-up CL
Test: forrest
Bug: 143734706

Change-Id: I007acf228d4fb4d6a16ae9089e3f04cf33a567bb
2019-11-01 11:41:26 -07:00
Ulya Trafimovich
5877cec1fa Disable dexpreopt on targets that do not include default ART config.
Dexpreopt build commands should only be generated on targets that
include build/make/target/product/runtime_libart.mk, which sets the
necessary variables such as PRODUCT_SYSTEM_DEFAULT_PROPERTIES that
contain default values passed to dex2oat. This file also sets a
variable PRODUCT_USES_DEFAULT_ART_CONFIG that is used in
build/make/core/dex_preopt.mk to decide if boot images should be
installed.

On some targets build/make/target/product/runtime_libart.mk is not
included. Prior to this patch, on such targets invalid dexpreopt
commands were generated, but not used, so they did not cause any
visible build failures. The invalid commands can be grepped as:

  lunch qemu_trusty_arm64-userdebug && m nothing \
    && fgrep -e '-Xms ' $ANDROID_BUILD_TOP/out/soong/build.ninja

In this case '-Xms ' is an ill-formed option passed to dex2oat (the
option expects one argument, but none is passed).

This patch makes the DisablePreopt variable passed from make to
soong more strict: it not only requires WITH_DEXPREOPT, but also
PRODUCT_USES_DEFAULT_ART_CONFIG. This means that dexpreopt commands
will not be generated on targets that do not include
build/make/target/product/runtime_libart.mk.

Test: lunch aosp_walleye-userdebug && m \
    && find $ANDROID_BUILD_TOP/out -name 'boot.art'
    # expect to find files in /out/target/product/walleye/system/framework/$ARCH/

Test: lunch qemu_trusty_arm64-userdebug && m \
    && fgrep -e '-Xms ' $ANDROID_BUILD_TOP/out/soong/build.ninja
    # expect empty output

Change-Id: I3d765ed0dd8b38236b8bdd5c6202bb1d3f45f904
2019-11-01 18:20:35 +00:00
Andrei-Valentin Onea
d361e5354a Merge "Revert "Move partition size checks to python script"" am: 15e75e8807 am: 57e2d5d502
am: 7c1ee6b4c0

Change-Id: I84991a2cc25e4329892929a040f533ee297c3a42
2019-11-01 09:07:27 -07:00
Andrei-Valentin Onea
7c1ee6b4c0 Merge "Revert "Move partition size checks to python script"" am: 15e75e8807
am: 57e2d5d502

Change-Id: I5f141fec478e786651ab741077ee4f75d6ec7b94
2019-11-01 08:58:18 -07:00
Andrei-Valentin Onea
57e2d5d502 Merge "Revert "Move partition size checks to python script""
am: 15e75e8807

Change-Id: Ib20566af43adc53146fe4c19f7773bc007d62e07
2019-11-01 08:51:16 -07:00
Andrei-Valentin Onea
15e75e8807 Merge "Revert "Move partition size checks to python script"" 2019-11-01 15:36:10 +00:00
Raman Tenneti
e124b604f6 [automerger skipped] Delete AOSP/Email app. am: 3fa302e04f -s ours
am: 995e10e3b3 -s ours
am skip reason: change_id I2a32694b899bc4f0a0ba36b152c06689427dabf4 with SHA1 820f20e990 is in history

Change-Id: I1221b1d798553d48bf6c84d033a96c1287c53f8c
2019-11-01 06:44:02 -07:00
Raman Tenneti
995e10e3b3 [automerger skipped] Delete AOSP/Email app.
am: 3fa302e04f -s ours
am skip reason: change_id I2a32694b899bc4f0a0ba36b152c06689427dabf4 with SHA1 820f20e990 is in history

Change-Id: I5a5d4dae1e64a80c8482193ce723c7d9d2d4b695
2019-11-01 06:38:05 -07:00
Dan Willemsen
073de121a0 Merge "Update the docs for 'mm[m][a]'" am: 49aa6fc009 am: e9f389fc3e
am: a7ce5fe735

Change-Id: I666db1f9bc6a2fc45d7d9f505fc6f85ef389cffd
2019-11-01 00:11:01 -07:00
Dan Willemsen
a7ce5fe735 Merge "Update the docs for 'mm[m][a]'" am: 49aa6fc009
am: e9f389fc3e

Change-Id: Ib81ff4732bf6575568bae97f952e15a8727de3f9
2019-11-01 00:04:59 -07:00
Dan Willemsen
e9f389fc3e Merge "Update the docs for 'mm[m][a]'"
am: 49aa6fc009

Change-Id: I9d27a32335626b55dcfa66ee1a1a8d36f6e4651f
2019-10-31 23:58:17 -07:00