Commit graph

22209 commits

Author SHA1 Message Date
Treehugger Robot
9e0b4ed82a Merge "Improve checks for include dirs outside the source tree" 2019-12-06 21:49:25 +00:00
Ian Kasprzak
c99726bcf0 Merge "Include all system images in -with-license.sh" 2019-12-06 17:10:48 +00:00
Ivan Lozano
deaf3fc74a Merge "Exclude dirs from binder interface whitelisting" 2019-12-06 02:25:10 +00:00
Ian Kasprzak
8f9b3c196c Include all system images in -with-license.sh
Rename artifact to not use -img- which conflicts w/ TF
test filters.

Bug: 125451157
Test: Verified phone flash works with new with-license artifact.
Change-Id: I7dd4eb17a24f1bf36926a83939f69681ff8b26ad
2019-12-05 15:51:24 -08:00
Calin Juravle
64daf2e02a Merge "Add art dexpreopt to boot.zip archive" 2019-12-05 22:11:28 +00:00
Dan Willemsen
0cb422f0e7 Improve checks for include dirs outside the source tree
See the Changes.md addition for more details.

Test: treehugger (build_test on downstream branches)
Change-Id: I6ad6b454a6fccf93772fda26cfc7dd6bbfc07c40
2019-12-05 13:11:04 -08:00
Yifan Hong
dc0b50b2d5 Merge "Mark BOARD_HAL_STATIC_LIBRARIES as obsolete." 2019-12-05 20:11:32 +00:00
Ivan Lozano
b18979aa20 Exclude dirs from binder interface whitelisting
Exclude vendor/ and hardware/ from the manually written binder interface
whitelist.

Bug: 136279235
Test: interfaces in excluded directories are not checked against whitelist.
Change-Id: I71152995466a25e92b6d0b153538ebfc1b252f5b
2019-12-05 12:09:38 -08:00
Treehugger Robot
d97822a5f7 Merge "Remove passing -forceprocessing flag to R8" 2019-12-05 08:56:38 +00:00
Calin Juravle
abdea2183d Add art dexpreopt to boot.zip archive
Test: m out/target/product/generic_arm64/boot.zip
Bug: 144491400
Change-Id: Id5f14efbbdf539f9f61599f2fbbc1a302334bb9a
2019-12-04 16:50:17 -08:00
Yifan Hong
88adfc6349 Mark BOARD_HAL_STATIC_LIBRARIES as obsolete.
No device in our tree use this obsolete thing now.
OEM devices with libhealthd should define health HAL
2.1 instead.

Test: builds
Fixes: 127677771
Change-Id: I1861452a3f7fc97ee20615c8f9f25422f9f507e2
2019-12-04 14:50:59 -08:00
Treehugger Robot
e16258ff5d Merge "Merge Android10 QPR1 into AOSP master" 2019-12-03 23:15:06 +00:00
Treehugger Robot
c4fbb3a42d Merge "Add rust_device_test_config_template.xml" 2019-12-03 21:19:12 +00:00
Ulya Trafimovich
3ad6f5ebbf Add boot image locations to the module dexpreopt config.
Multiple boot image locations should be passed to dex2oat after
splitting the boot image into primary ART image and the framework
boot image extension.

Test: m

Bug: b/119800099

Change-Id: Ide6dfed1d09a6c12aad6f1cc0d4af4fb2c63a6be
2019-12-03 10:27:26 +00:00
Roshan Pius
41e679308d Merge "base_system.mk: Align formatting for updatable boot jar variable"
am: 78560b2049

Change-Id: I677772fbf43148932f1a0af457f3060727594a06
2019-12-02 16:47:47 -08:00
Bill Peckham
0a17dc31f3 Merge "Don't generate recovery patch for A/B systems."
am: 43e5420a50

Change-Id: Iabcccc6dbf0f511150762df526facc0cf7ba1e1a
2019-12-02 16:45:58 -08:00
Roshan Pius
78560b2049 Merge "base_system.mk: Align formatting for updatable boot jar variable" 2019-12-03 00:43:17 +00:00
Bill Peckham
43e5420a50 Merge "Don't generate recovery patch for A/B systems." 2019-12-03 00:42:22 +00:00
Alistair Delva
7ad9383ad2 Merge "Allow f2fs sparse mode to be disabled"
am: 1cfe41269f

Change-Id: Ifdecf81b59542befab6c37189fd71cf00e4bc2b0
2019-12-02 14:06:40 -08:00
Alistair Delva
1cfe41269f Merge "Allow f2fs sparse mode to be disabled" 2019-12-02 21:54:20 +00:00
Bill Peckham
c0f413f0ad Don't generate recovery patch for A/B systems.
An A/B system that has a recovery image should not generate the recovery patch.
This change gates the creation of the recovery patch such that we create it
only when the recovery image exists and only for non-A/B systems.

Test: Build A/B system, verify that recovery patch is not present.
Bug: 144104493
Change-Id: Ib570c21b73912c4e4b7a964b192abc15fde9a753
2019-12-02 18:16:01 +00:00
Chih-Hung Hsieh
0d51f2fe2f Add rust_device_test_config_template.xml
* Derived from native_test_config_template.xml

Bug: 140938178
Test: make rust projects
Change-Id: I5bfeb0a578cb0fcf134eb9b524a6d3e5b6eeafcc
2019-12-02 17:44:47 +00:00
Dan Shi
f9fd7aa810 Merge "Add vts-core-tradefed.jar to general-tests.zip"
am: 06c957dde2

Change-Id: If84ce465104bb9a4deda11aefac24477f2d50b63
2019-11-29 20:52:22 -08:00
Dan Shi
06c957dde2 Merge "Add vts-core-tradefed.jar to general-tests.zip" 2019-11-30 04:47:54 +00:00
Roshan Pius
626f6371dc base_system.mk: Align formatting for updatable boot jar variable
Migrate PRODUCT_UPDATABLE_BOOT_MODULES &
PRODUCT_UPDATABLE_BOOT_LOCATIONS to a new PRODUCT_UPDATABLE_BOOT_JARS.
This new variable uses the same format as
PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS, i.e <apex>:<jar> pair.

Test: Compiles & flashed device. Ensured that the bootclasspath & system_server class
paths remain the same.

Change-Id: I1cb26d5ec825cd1f5282a6e0255094ddf2fe046a
2019-11-28 12:59:08 +00:00
Kris Alder
6d1974bf9b Merge "rename 'make fuzz' to 'make haiku'"
am: fe283c99e6

Change-Id: Id8a217d7f66ccebf3101b2e783866683247cb7bd
2019-11-27 10:10:25 -08:00
Kris Alder
fe283c99e6 Merge "rename 'make fuzz' to 'make haiku'" 2019-11-27 17:29:00 +00:00
Ulyana Trafimovich
1dd62c175f Merge "Revert^2 "Do not dexpreopt system server jars from updatable modules.""
am: 28ef4100ac

Change-Id: I70f7b32db9f495f7fcdcb98ddb671c3408d77aa4
2019-11-27 06:08:35 -08:00
Ulyana Trafimovich
28ef4100ac Merge "Revert^2 "Do not dexpreopt system server jars from updatable modules."" 2019-11-27 12:45:34 +00:00
Ulyana Trafimovich
213a7d86d5 Revert^2 "Do not dexpreopt system server jars from updatable modules."
This reverts commit fa7cf280ca.

Reason for revert: Build failure is not reproducible.
Forrest build on the same build ID 6033773 and same target
cf_x86_phone-userdebug_coverage finished successfully.

Change-Id: I188623237dfba657fb48966e0a34a975f13d00d2
2019-11-27 12:29:42 +00:00
Søren Gjesse
f38d3ccf47 Remove passing -forceprocessing flag to R8
R8 ignores the flag

Test: m -j
Change-Id: Id938aa35e87c9c69769a3184dfea06fd02299688
2019-11-27 12:41:45 +01:00
Dan Willemsen
310a8ed1fa Merge "Clean include directory paths"
am: f425c0964b

Change-Id: I2b0be61215018036bf0416ba74ea5b4d9cdff715
2019-11-26 15:37:29 -08:00
Kris Alder
8c8c2b96f2 rename 'make fuzz' to 'make haiku'
Bug: 145147479
Test: ran 'make haiku' locally, verified results match
Change-Id: I56b9bcfabe7dee705008e711d7c7d85421643e42
2019-11-26 12:03:39 -08:00
Ulyana Trafimovich
44b94acf3e Merge "Revert "Do not dexpreopt system server jars from updatable modules.""
am: b5dd40ed2b

Change-Id: I5fd4dfae439ff8c658fa0a32d95abf6d52629c74
2019-11-26 05:19:59 -08:00
Ulyana Trafimovich
b5dd40ed2b Merge "Revert "Do not dexpreopt system server jars from updatable modules."" 2019-11-26 13:07:48 +00:00
Ulyana Trafimovich
fa7cf280ca Revert "Do not dexpreopt system server jars from updatable modules."
This reverts commit 3fb6a949a6.

Reason for revert: broken build git_master/cf_x86_phone-userdebug_coverage (likely caused by these changes).

Exempt-From-Owner-Approval: revert.

Change-Id: Ib72fe0395fd084e774d25ee783b7380395f9d9bd
2019-11-26 13:06:13 +00:00
Ulyana Trafimovich
6ff6d78fb5 Merge "Do not dexpreopt system server jars from updatable modules."
am: 51833931af

Change-Id: Ia4ccc35c1b281a1c2732d963dbe29ec454367cfe
2019-11-26 02:26:32 -08:00
Ulyana Trafimovich
51833931af Merge "Do not dexpreopt system server jars from updatable modules." 2019-11-26 10:18:02 +00:00
Dan Willemsen
c9a657c907 Clean include directory paths
To remove '../' and other strangeness from compiler arguments, which run
into problems with remote execution:

  Android.mk: LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/bar/..
  foo.c: #include "foo.h"
  include/foo.h

In this case, we'll send foo.c and include/foo.h, but include/bar may be
empty, and not exist on the remote server. So while the file is there,
you may not be able to access it.

There's also a byproduct of removing extra '/' and './' components,
which should be harmless.

Fixes: 144109314
Test: diff build-aosp_arm.ninja before/after; scan diffs
Test: treehugger
Change-Id: Id2eceba76fbf9b1524487e82cb5c8903c815e45f
2019-11-25 20:39:22 -08:00
Yifan Hong
7b3a7105e5 Merge "Move check partition size logs to a file"
am: 874a5aa95e

Change-Id: If2c6e251773f9ffe353abf3da02a07b57ee169eb
2019-11-25 16:47:04 -08:00
Yifan Hong
874a5aa95e Merge "Move check partition size logs to a file" 2019-11-26 00:32:52 +00:00
Ulya Trafimovich
3fb6a949a6 Do not dexpreopt system server jars from updatable modules.
Test: m

Test: The list of updatable system server jars is empty now,
  so I tested that the filer works with a manual experiment:
  - temporarily add wifi-service to PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS
  - m nothing
  - fgrep -e 'wifi-service dexpreopt' $ANDROID_BUILD_TOP/out/build-$TARGET_PRODUCT.ninja
  - expect empty output (no dexpreopt command is generated)

Change-Id: Ia4206ccc263b535b6e39b54c6e8db28845ff2bf5
2019-11-25 16:36:52 +00:00
TreeHugger Robot
8974b44505 Merge "Merge QQ1A.191205.011 into stage-aosp-master" into stage-aosp-master 2019-11-24 07:37:08 +00:00
Dan Shi
bafb1d7289 Add vts-core-tradefed.jar to general-tests.zip
This is needed for vts-core tests require vts specific preparers.

Bug: 142972256
Test: m -j general-tests
Change-Id: Ic2def11ac5f57a923d2bcefe6683e9a5fa66e7c6
2019-11-23 12:16:11 -08:00
Roshan Pius
20cc65daed Merge "base_system.mk: Support system_server jars from apexes"
am: 9dda264619

Change-Id: Ie5ad1cb9e89070adb95fe5ad2a69f8b0dabf899a
2019-11-22 19:15:39 -08:00
Xin Li
8ad8d1bc6e Merge QQ1A.191205.011 into stage-aosp-master
Bug: 144955631
Merged-In: Ic7ee4e41d29762471fc5b25dce6e757858fd1ea9
Change-Id: Id6deffc7ce714a7ddf7855293cd0fb629724fdeb
2019-11-22 13:59:33 -08:00
Roshan Pius
d6e239fc35 base_system.mk: Support system_server jars from apexes
Allow system_server jars delivered via apex. Regular system_server
jars are located in /system/framework folder. But, jars delivered via
apex are mounted at /apex/<module_name>/javalib. Also, not all the
libraries in /apex/<module_name>/javalib will be a system_server jar,
so adding a mechanism to list out the jar file explicitly within the
apex module.

Bug: 144722612
Bug: 141785760
Test: Compiles (both with empty & non-empty PRODUCT_SYSTEM_SERVER_APEX_JARS
value set)

Change-Id: Ia181ab22fdf2da575bfd532c1cd90a2f54742528
2019-11-22 12:48:09 -08:00
Xin Li
cde85ce1eb DO NOT MERGE - Merge QQ1A.191003.001 into stage-aosp-master
Bug: 144955631
Change-Id: I975a0b433b102ed580b70ff1cb83ad8c6ccdae45
2019-11-22 10:47:43 -08:00
Jaewoong Jung
18b0a0a072 Merge "Copy additional test apk outputs to suite dirs."
am: 4a0832210c

Change-Id: I4b64fa007314398a9a8910ba0eb78668b784ab8a
2019-11-21 15:26:21 -08:00
Treehugger Robot
4a0832210c Merge "Copy additional test apk outputs to suite dirs." 2019-11-21 23:20:16 +00:00