Commit Graph

22765 Commits

Author SHA1 Message Date
Dan Willemsen
310a8ed1fa Merge "Clean include directory paths"
am: f425c0964b

Change-Id: I2b0be61215018036bf0416ba74ea5b4d9cdff715
2019-11-26 15:37:29 -08:00
android-build-team Robot
44bb8ac9d9 Version bump to QQ2A.191125.002 [core/build_id.mk]
Change-Id: I06bc6be114df110052e0aca642ff860e9b7f85fc
2019-11-26 20:13:56 +00: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
0678652fda Merge "Revert "Do not dexpreopt system server jars from updatable modules."" am: b5dd40ed2b
am: 44b94acf3e

Change-Id: I3eba66d7ba56d89c51f0dcce99a2bd0acade2b57
2019-11-26 05:22:17 -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
a36b594f01 Merge "Do not dexpreopt system server jars from updatable modules." am: 51833931af
am: 6ff6d78fb5

Change-Id: Ib14b408532b5cfb48d8fd28fe661881c80704851
2019-11-26 02:28:52 -08: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
2df96d7bba Merge "Move check partition size logs to a file" am: 874a5aa95e
am: 7b3a7105e5

Change-Id: Ia7af36b4b4e6edb1fb27780fd908d48d564c69b4
2019-11-25 16:49:37 -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
android-build-team Robot
dde8c630c2 Make change and version bump to QQ2A.191125.001
Change-Id: Ibf18024b1632a2df56bff84ce930c5362392894b
2019-11-25 00:21:50 +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
android-build-team Robot
458618cdfc Make change and version bump to QQ2A.191124.001
Change-Id: Ia51090726a72e3b8dc0f07681786e3b2986bed23
2019-11-24 00:23:55 +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
b318e9931e Merge "base_system.mk: Support system_server jars from apexes" am: 9dda264619
am: 20cc65daed

Change-Id: Ic97d9b992b06c6d0c34f21dd31e6783e1a06206d
2019-11-22 19:18:01 -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
7612a2d676 DO NOT MERGE - Merge QQ1A.191003.001 into stage-aosp-master
am: cde85ce1eb

Change-Id: I84457bae8a8b6050a1bd7b7f916cb67613cec219
2019-11-22 11:07:17 -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
c68e033695 Merge "Copy additional test apk outputs to suite dirs." am: 4a0832210c
am: 18b0a0a072

Change-Id: Ic7ee4e41d29762471fc5b25dce6e757858fd1ea9
2019-11-21 15:30:17 -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
android-build-team Robot
8ad367f79c Make change and version bump to QQ2A.191121.001
Change-Id: Ie58a5de6c27582197027bdf0d2a6aa22af6ad409
2019-11-21 02:20:49 +00:00
Steve Muckle
d24f472781 Merge "add BOARD_*_KERNEL_MODULE_ARCHIVE support" am: cedced8471
am: 3d14362ad2

Change-Id: I19aa0077cfa3aa047684944e0431877b93855a50
2019-11-20 15:09:52 -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
android-build-team Robot
89381650aa Make change and version bump to QQ2A.191120.001
Change-Id: I06c2444d75c6da0779b248421a35d5f9e44d82f5
2019-11-20 02:21:40 +00:00
Jerome Gaillard
e5ab595059 Allow files generated by droidstubs to be copied in the SDK am: 7aa3039ef9
am: 8be676d24a

Change-Id: Ifd141dd407eadacc4bcc6b5002b7d66da8d3d6d5
2019-11-19 04:29:16 -08:00
Jerome Gaillard
8be676d24a Allow files generated by droidstubs to be copied in the SDK
am: 7aa3039ef9

Change-Id: Ief97856b0633e4100856f9e507755b15cef8c4d3
2019-11-19 04:25:39 -08:00
android-build-team Robot
aad4ce1c5e Make change and version bump to QQ2A.191119.001
Change-Id: Ifd4b4e69e8c677a753e4b97e363a62f36824e463
2019-11-19 02:20:46 +00:00
Jerome Gaillard
7aa3039ef9 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
Merged-In: I7a0b22907603e1d17ac05901ee7f8bb9cff89f7f
2019-11-18 10:38:13 +00:00
android-build-team Robot
e38293b3b7 Make change and version bump to QQ2A.191118.001
Change-Id: If0ca64ea6093b8771c199073c70f062acbabf723
2019-11-18 00:21:13 +00:00
android-build-team Robot
6ce2aebde0 Make change and version bump to QQ2A.191117.001
Change-Id: Ic7a39cc37178695f982ceb80b441de3bad3bc311
2019-11-17 00:22:03 +00:00
Chih-hung Hsieh
8f1cc39d04 Merge "Set NATIVE_TESTS executable like EXECUTABLES" am: 74a4605a6d
am: dc9de09156

Change-Id: If57ed10bcd33cda769ef9077a6f3420edbdcf6a9
2019-11-15 22:05:18 -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
Lubo Hristov
466c8fd3b2 Set SPL to 2020-01-05
am: 12489ad00b

Change-Id: Idb89d6e4dfb1515166add8b72fe526d4572e1a06
2019-11-15 12:23:17 -08:00
Lubo Hristov
5eb7b066a1 Set SPL to 2020-01-01
am: 07e7d6b643

Change-Id: I7e4e99e0da7387b13c94059b7ab1beb98ac47591
2019-11-15 12:23:14 -08: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