Commit Graph

22292 Commits

Author SHA1 Message Date
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
android-build-team Robot
cf6352bdec Version bump to QQ1A.200105.002 [core/build_id.mk]
Change-Id: I6e70bc8678340e38a54ca4457c36062f44466390
2019-11-25 20:21:50 +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
Jaewoong Jung
8bc6908feb Copy additional test apk outputs to suite dirs.
Bug: 143902486
Test: m CtsIsolatedSplitApp
Change-Id: I13900ac2c8bb886987362dd380818ab5df2f23c6
2019-11-21 10:36:28 -08:00
Steve Muckle
3d14362ad2 Merge "add BOARD_*_KERNEL_MODULE_ARCHIVE support"
am: cedced8471

Change-Id: Ifd20422472c760a5c82e1eb134e6fecc588ba1be
2019-11-20 15:06:21 -08:00
Treehugger Robot
cedced8471 Merge "add BOARD_*_KERNEL_MODULE_ARCHIVE support" 2019-11-20 22:57:39 +00:00
Steve Muckle
810a0ba56f add BOARD_*_KERNEL_MODULE_ARCHIVE support
It may be the case that the list of kernel modules to be copied into
various partitions is not known at the time the build is invoked. To
support this configuration, create a set of make variables, each of
which can be set to the path of a zip archive of kernel modules to be
used.

Bug: 144317186
Bug: 144844424
Test: build and verify *.ko in vendor, repackage prebuilt
      kernel modules into zip, build and verify *.ko in vendor
Change-Id: Ie6f7e2c72efa11d39be341920dd46e4ed6678fe1
2019-11-20 10:46:13 -08:00
Chih-hung Hsieh
dc9de09156 Merge "Set NATIVE_TESTS executable like EXECUTABLES"
am: 74a4605a6d

Change-Id: Ib656ccf3b45bd2b2b9095de8d27417f0ca9442cc
2019-11-15 19:06:29 -08:00
android-build-team Robot
c5c354cf8d Version bump to QQ1A.200105.001 [core/build_id.mk]
Change-Id: Ia45df9d0244879d1d9529836ed14f12971ba7ca2
2019-11-16 00:28:58 +00:00
Chih-Hung Hsieh
ef17769720 Set NATIVE_TESTS executable like EXECUTABLES
* Rust test modules should have NATIVE_TESTS class,
  not EXECUTABLES, to work with atest --host.

Bug: 140938178
Test: make rust projects
Change-Id: I45c84284d894702471ea46faaa599de27ab6be51
2019-11-15 14:10:09 -08:00
android-build-team Robot
e2037fd2df Version bump to QQ1A.200101.002 [core/build_id.mk]
Change-Id: Ia5c4c3fc12b68034f4b2c080b6d882f4a3523a07
2019-11-15 21:46:35 +00:00
Alistair Delva
91238cce14 Allow f2fs sparse mode to be disabled
Bug: 142424832
Bug: 142803849
Change-Id: Ic112128f15e3f29208332afceea4fbc3fca40b36
2019-11-15 19:05:41 +00:00
Colin Cross
bf28e91640 Merge "Set pools manually for rules that can run in RBE or goma"
am: 9d789145fa

Change-Id: I3ea73fcd278b6a60d381d84776e7bde95691d059
2019-11-15 10:41:11 -08:00
Colin Cross
9d789145fa Merge "Set pools manually for rules that can run in RBE or goma" 2019-11-15 18:19:33 +00:00
android-build-team Robot
4d8968479b Make change and version bump to QQ1A.200101.001
Change-Id: Iea43f79d947c2c7515743176653743fb84efe250
2019-11-15 06:16:21 +00:00
Lubo Hristov
5385a7af68 Set SPL to 2020-01-01
bug:144373594
(cherry picked from commit 07e7d6b643)

Change-Id: Ic0687569eb308dbbb78663d51bc68ce68a83c6a7
2019-11-15 06:15:19 +00:00
Chih-hung Hsieh
f84e7da928 Merge "Add rust_host_test_config_template.xml"
am: 83131cbef9

Change-Id: I259eb82edb52cebe9b87d5ffc7f2a0fd79973b66
2019-11-14 13:22:34 -08:00
android-build-team Robot
e8d7dc64b6 Version bump to QQ1A.191205.011 [core/build_id.mk]
Change-Id: I3cc9df62b65018e773f03abd0c0dc7cf88e75e9d
2019-11-14 19:23:37 +00:00
Chih-Hung Hsieh
43abe9590f Add rust_host_test_config_template.xml
* Derived from python_binary_host_test_config_template.xml

Bug: 140938178
Test: make rust projects
Change-Id: I050e310c25952d7ca7af25ca2803f98817e465c8
2019-11-14 09:57:13 -08:00
android-build-team Robot
a94d4e76a0 Version bump to QQ1A.191205.010 [core/build_id.mk]
Change-Id: I10000f02ea6061e5d9368b3be801b41db461dbb8
2019-11-13 19:44:22 +00:00
Tom Cherry
c0a7f38dbc Merge "Check property type in host_init_verifier"
am: 3c697d59fb

Change-Id: I332fa511a40b644b85456cc676ff895cae41623f
2019-11-13 10:51:07 -08:00
Tom Cherry
3c697d59fb Merge "Check property type in host_init_verifier" 2019-11-13 18:41:17 +00:00
Colin Cross
749bdefcb2 Merge "Forbid -Weverything"
am: c33f240d3c

Change-Id: I313709e74d6ddd8c5e317b8a056d639dc80da4fe
2019-11-13 08:08:37 -08:00
Tom Cherry
fac072ddc8 Merge "Move init and ueventd scripts from / to /system/etc"
am: 4f51fba546

Change-Id: I9e9300827af707db35be06958d15d9763322c2be
2019-11-13 08:06:04 -08:00