Commit Graph

60471 Commits

Author SHA1 Message Date
Bill Peckham
0d5a6748a8 Merge "Allow recording ALL_DEPS by setting RECORD_ALL_DEPS" 2020-04-27 20:59:48 +00:00
Steve Muckle
125b6d6eea enable BOARD_EXT4_SHARE_DUP_BLOCKS for generic_arm64
Bug: 154907226
Change-Id: Iab55afbfaf7d28ac0e826f8eb94b113a2780a4c9
Merged-In: Iab55afbfaf7d28ac0e826f8eb94b113a2780a4c9
2020-04-27 13:52:28 -07:00
Luca Stefani
7f4ca3ac04 releasetools: Add missing log format specifier
bug: 154786239
Test: m otapackage
Change-Id: I273cf315400dd2b624d2853ece0c30c6fb3d529d
(cherry picked from commit 88e1a14523)
2020-04-27 20:50:27 +00:00
Dan Shi
d7da773033 Merge "[VTS] copy ltp and kselftest to testcase folder" am: 6c04458129 am: fcaa097370
Change-Id: Id8758e59c828e8918907fe2d72aa5fb99ce61bca
2020-04-27 18:56:09 +00:00
Dan Shi
fcaa097370 Merge "[VTS] copy ltp and kselftest to testcase folder" am: 6c04458129
Change-Id: I1eaeabc4772aaa2b4cdc678259a3c2b5ff814669
2020-04-27 18:39:56 +00:00
Dan Shi
6c04458129 Merge "[VTS] copy ltp and kselftest to testcase folder" 2020-04-27 18:28:17 +00:00
Bill Peckham
a2c63454a6 Allow recording ALL_DEPS by setting RECORD_ALL_DEPS
This change enables recording ALL_DEPS information
without having to specify the deps-license goal, which
can be useful to populate the dependencies field of
module-info.json for various types of post-processing.

Usage: `RECORD_ALL_DEPS=true make droid` (preferred), or
`make RECORD_ALL_DEPS=true droid`.

Test: make, inspect module-info.json
Test: RECORD_ALL_DEPS=true make, inspect module-info.json
Bug: 151755703
Change-Id: Ib81a8dfb0ecbe0b63be320a9d33e558b419cb4b2
2020-04-27 18:28:10 +00:00
Treehugger Robot
4cce52e6c9 Merge "enable BOARD_EXT4_SHARE_DUP_BLOCKS for generic_arm64" am: 32a8c39ca8 am: d83b073343
Change-Id: Ie2571501ec627b2d840e9e3d3dc7fe389daa6f6e
2020-04-27 18:03:16 +00:00
Treehugger Robot
d83b073343 Merge "enable BOARD_EXT4_SHARE_DUP_BLOCKS for generic_arm64" am: 32a8c39ca8
Change-Id: Ib1870673d589307b0cefe6324afab61483f5802c
2020-04-27 17:49:01 +00:00
Treehugger Robot
32a8c39ca8 Merge "enable BOARD_EXT4_SHARE_DUP_BLOCKS for generic_arm64" 2020-04-27 17:31:52 +00:00
Jeongik Cha
07a44f48dc Exempt RRO from the restriction on API level
As auto generated RRO, an arbitrary RRO needs to be exempted as well.
It is okay because RRO packages can access only resource defined in
public.xml, when RRO packages want to refer other package's resource.

Bug: 152926556
Test: build RRO packages
Test: check if product/vendor app still can't use hidden APIs
Change-Id: I8dc2922af5eb5c87ccd97d1b8d080b3ed48cf9a6
2020-04-27 22:36:21 +09:00
Treehugger Robot
9147c6ca1f Merge "Restore $(SOONG_OUT_DIR)/ndk/% in static_whitelist_patterns" am: 7b66a61d9b am: 627e62e1a6
Change-Id: Ifc750410707f35ccf4822b42ec0e3ab3b3111d9b
2020-04-27 11:11:33 +00:00
Treehugger Robot
627e62e1a6 Merge "Restore $(SOONG_OUT_DIR)/ndk/% in static_whitelist_patterns" am: 7b66a61d9b
Change-Id: Ia7c2312a0c912915e7cbf14ade29057ad6994746
2020-04-27 11:02:02 +00:00
Treehugger Robot
7b66a61d9b Merge "Restore $(SOONG_OUT_DIR)/ndk/% in static_whitelist_patterns" 2020-04-27 10:48:53 +00:00
Ulyana Trafimovich
95bb4b7d24 [automerger skipped] Merge "Add PRODUCT_SYSTEM_SERVER_JARS_EXTRA interface" into rvc-dev am: 9b36bb4632 -s ours
am skip reason: Change-Id I0ddf35bdf725c262f817985f5494b5968db21fcd with SHA-1 2a703ce2f6 is in history

Change-Id: Ie1ee366f12e82a3deca650be618702fc5da8ea3a
2020-04-27 08:31:44 +00:00
Ulyana Trafimovich
9b36bb4632 Merge "Add PRODUCT_SYSTEM_SERVER_JARS_EXTRA interface" into rvc-dev 2020-04-27 08:22:01 +00:00
Rock.Yeh
3c21474100 Add PRODUCT_SYSTEM_SERVER_JARS_EXTRA interface
This interface allows vendor to append their system server jars after AOSP's
without changing inherit order.

Test: booting
Test: build pass on branch r-fs-release with this patch
Bug: 140712566
Change-Id: I0ddf35bdf725c262f817985f5494b5968db21fcd
Merged-In: I0ddf35bdf725c262f817985f5494b5968db21fcd
(cherry picked from commit 2a703ce2f6)
Exempt-From-Owner-Approval: cherry-pick
2020-04-27 08:21:22 +00:00
Jeongik Cha
82fead38a4 Restore $(SOONG_OUT_DIR)/ndk/% in static_whitelist_patterns
$(SOONG_OUT_DIR)/ndk/% needs to be whistlisted in release branch
(ag/11251273)
Accordingly, restore it in aosp as well.

Bug: 148993225
Test: m nothing
Change-Id: I7503c007c3e786b0cab26ea1422f0d4ba5a40662
2020-04-27 04:44:58 +00:00
Jiyong Park
f9e67a8980 mark platform un-availability
A module is marked unavailable for platform when 1) it does not have
"//apex_available:platform" in its apex_available property, or 2)
it depends on another module that is unavailable for platform.

In that case, LOCAL_NOT_AVAILABLE_FOR_PLATFORM is set to true for the
module in the Make world. Later, that flag is used to ensure that there
is no module with the flag is installed to the device.

The reason why this isn't entirely done in Soong is because Soong
doesn't know if a module will be installed to the device or not. To
explain this, let's have an example.

cc_test { name: "mytest", static_libs: ["libfoo"]}
cc_library_static { name: "libfoo", static_libs: ["libbar"]}
cc_library { name: "libbar", apex_available: ["com.android.xxx"]}

Here, libbar is not available for platform, but is used by libfoo which
is available for platform (apex_available defaults to
"//apex_available:platform"). libfoo is again depended on by mytest
which again is available for platform. The use of libbar should be
allowed in the context of test; we don't want to make libbar available
to platform just for the dependency from test because it will allow
non-test uses of the library as well.

Soong by itself can't tell whether libfoo and libbar are used only in the
context of a test. There could be another module depending them, e.g.,

cc_library_shared { name: "mylib", static_libs: ["libfoo"] }

can exist and it might be installed to the device, in which case
we really should trigger an error.

Since Make has the knowledge of what's installed and what's not,
the check should be done there.

Bug: 153073816
Test: m

Change-Id: I14ddf0e5700d0a7bf60e4e41536efbd26ab5ed3d
2020-04-27 08:46:41 +09:00
Jeongik Cha
034cd871ae Extend static_whitelist_patterns
product-installed-files generates more default artifacts than
$(call module-installed-files,$(call auto-included-modules)),
and it causes problems when we try to apply this mechanism to other
partition

So use product-installed-files with an empty parameter as static
whitelist

Test: apply require-artifacts-in-path to other partition(or path),
      and then, m nothing
Test: add system module outside mainline_system.mk, and check if there is error.

Bug: 148993225
Change-Id: Ie110f20ff833229b23a777ff1decb32f84b9cef7
Merged-In: Ie110f20ff833229b23a777ff1decb32f84b9cef7
2020-04-26 16:29:46 +09:00
Baligh Uddin
7a1f00a2f5 Allow passing in codename_to_api_level_map to sign_apex. am: 8424f2e56c
Change-Id: I2381a2a4708f91deff051c539f4e65894e86a875
2020-04-25 20:55:30 +00:00
Baligh Uddin
8424f2e56c Allow passing in codename_to_api_level_map to sign_apex.
BUG: 154517483
Change-Id: I93a90ae066b0e9eeb1b2ff26d9cb9b07a11fe68c
2020-04-25 18:30:24 +00:00
Treehugger Robot
d9cc1a78b6 [automerger skipped] Remove phony target vts-core am: 5d979e29cf -s ours
am skip reason: Change-Id I5d1b1058b18153c9cedb33b151dec8daab3e2e57 with SHA-1 c581e59998 is in history

Change-Id: I00a5e739115ef19b99c5a30947f0a13b389d73ae
2020-04-24 23:22:52 +00:00
Steve Muckle
e0a08fde91 enable BOARD_EXT4_SHARE_DUP_BLOCKS for generic_arm64
Bug: 154907226
Change-Id: Iab55afbfaf7d28ac0e826f8eb94b113a2780a4c9
2020-04-24 23:10:02 +00:00
Treehugger Robot
5d979e29cf Remove phony target vts-core
The target has been removed from all builders.

Bug: 151896491
Test: none
Change-Id: I5d1b1058b18153c9cedb33b151dec8daab3e2e57
Merged-In: I5d1b1058b18153c9cedb33b151dec8daab3e2e57
2020-04-24 21:52:47 +00:00
Dan Shi
7d1f8cec25 [VTS] copy ltp and kselftest to testcase folder
Bug: 154446791
Test: m -j vts_kernel_tests vts
Change-Id: I405c227293085d3fd0603e9eba5ce276d7dc14d5
2020-04-24 14:49:25 -07:00
Ivan Lozano
fcd8fcefa8 Add support for Rust coverage files from Soong.
Bug: 146448203
Test: Coverage file zips are installed correctly by make.
Change-Id: Ia087ec87e5c7be0a91a43307abeabafaa9b366f3
2020-04-24 16:29:17 -04:00
Ulyana Trafimovich
83e01282cf Merge "Add PRODUCT_SYSTEM_SERVER_JARS_EXTRA interface" am: 7146d5f41e am: 3de18eec43
Change-Id: I31886b2e21d9579e870cdeb73d57a423cc51de44
2020-04-24 15:54:01 +00:00
Ulyana Trafimovich
3de18eec43 Merge "Add PRODUCT_SYSTEM_SERVER_JARS_EXTRA interface" am: 7146d5f41e
Change-Id: Iee7b33b55bff301114948a5cd7108ba7391565b5
2020-04-24 15:44:22 +00:00
Ulyana Trafimovich
7146d5f41e Merge "Add PRODUCT_SYSTEM_SERVER_JARS_EXTRA interface" 2020-04-24 15:23:32 +00:00
Treehugger Robot
4d5a3d8655 Merge "Clean up static_whitelist_patterns" am: 691d385147 am: 75ff753569
Change-Id: If011c50e830855fb7b71bbf7729d7c429beb8137
2020-04-24 12:25:21 +00:00
Treehugger Robot
75ff753569 Merge "Clean up static_whitelist_patterns" am: 691d385147
Change-Id: I2a5fc9c5281bd94343ac315ef64da66077dded1e
2020-04-24 12:13:14 +00:00
Treehugger Robot
691d385147 Merge "Clean up static_whitelist_patterns" 2020-04-24 12:03:21 +00:00
Treehugger Robot
737bcbd04b Merge "Extend static_whitelist_patterns" am: 4aa437f3ab am: 43e1e38bd1
Change-Id: Ia150a51a515d6b04407d3714a8961a81f848968f
2020-04-24 08:39:59 +00:00
Treehugger Robot
43e1e38bd1 Merge "Extend static_whitelist_patterns" am: 4aa437f3ab
Change-Id: Ic046400bfec2080dc991866db5df22fea672a82a
2020-04-24 08:17:31 +00:00
Treehugger Robot
4aa437f3ab Merge "Extend static_whitelist_patterns" 2020-04-24 08:02:33 +00:00
Jeongik Cha
ab50b8fa85 Extend static_whitelist_patterns
product-installed-files generates more default artifacts than
$(call module-installed-files,$(call auto-included-modules)),
and it causes problems when we try to apply this mechanism to other
partition

So use product-installed-files with an empty parameter as static
whitelist

Test: apply require-artifacts-in-path to other partition(or path),
      and then, m nothing
Test: add system module outside mainline_system.mk, and check if there is error.

Bug: 148993225
Change-Id: Ie110f20ff833229b23a777ff1decb32f84b9cef7
2020-04-24 05:08:02 +00:00
Jeongik Cha
4472819166 Clean up static_whitelist_patterns
$(HOST_OUT)/% and $(SOONG_OUT_DIR)/ndk/% are not necessary anymore.

Bug: b/148993225
Test: m nothing
Change-Id: If2551283ebb6c516c029d1c04aebe25661bc6a1a
2020-04-24 14:05:49 +09:00
TreeHugger Robot
48b590c6ec [automerger skipped] Merge changes I465ea6c9,I57b77d7c,I536a286d,Ie16a7bf7 into rvc-dev am: 04735a8ef2 -s ours
am skip reason: Change-Id I465ea6c98d52e839284d51b246203f6b8dfb5566 with SHA-1 0959fbfd2e is in history

Change-Id: I377b95deb72ab713326805e2d312d356c26e5726
2020-04-23 23:37:38 +00:00
TreeHugger Robot
04735a8ef2 Merge changes I465ea6c9,I57b77d7c,I536a286d,Ie16a7bf7 into rvc-dev
* changes:
  generate multiple boot.img files in aosp_arm64
  create emulator_arm64 device for sdk_phone_arm64 to use
  support multiple boot.img files in release tools
  multi boot.img support cleanups
2020-04-23 23:20:16 +00:00
Rock.Yeh
2a703ce2f6 Add PRODUCT_SYSTEM_SERVER_JARS_EXTRA interface
This interface allows vendor to append their system server jars after AOSP's
without changing inherit order.

Test: booting
Test: build pass on branch r-fs-release with this patch

Change-Id: I0ddf35bdf725c262f817985f5494b5968db21fcd
2020-04-23 10:29:40 +08:00
TreeHugger Robot
85e346f649 [automerger skipped] Merge "Make RRO packages for system_ext" into rvc-dev am: c0f3be1309 -s ours
am skip reason: Change-Id Id0ddb66adca07a6bb4dda66fbee49fd476ac5342 with SHA-1 d99e77d6d6 is in history

Change-Id: I1eded8387614c788ef2645f256013fd66fda7cf4
2020-04-23 01:47:28 +00:00
TreeHugger Robot
c0f3be1309 Merge "Make RRO packages for system_ext" into rvc-dev 2020-04-23 01:25:48 +00:00
Oliver Nguyen
ba3b7c3205 [automerger skipped] Merge "Export llvm-profdata for Clang coverage builds." into rvc-dev am: e213117fae -s ours
am skip reason: Change-Id I71e0e7afb05dedd5f6a09d5e4099387c6262387f with SHA-1 b02f7dbaa4 is in history

Change-Id: I0a907edcb521b3082d63ecb6e85562e59e2521ab
2020-04-22 21:48:58 +00:00
Oliver Nguyen
e213117fae Merge "Export llvm-profdata for Clang coverage builds." into rvc-dev 2020-04-22 21:26:09 +00:00
Steve Muckle
4b6b2003a9 generate multiple boot.img files in aosp_arm64
Generate boot.img variants with different schemes for kernel compression
(gzip, lz4, none).

The boot image is removed from vbmeta for aosp_arm64 since it is
not possible currently to store the hashes of multiple variants of a
particular image. The GKI will be verified via VTS anyway.

Also remove some emulator-specific stuff from aosp_arm64.

Bug: 151094943
Change-Id: I465ea6c98d52e839284d51b246203f6b8dfb5566
Merged-In: I465ea6c98d52e839284d51b246203f6b8dfb5566
2020-04-22 11:48:52 -07:00
Steve Muckle
4bfa078008 create emulator_arm64 device for sdk_phone_arm64 to use
Changes are needed in generic_arm64 so that aosp_arm64 can be used to
distribute the GKI. These changes are incompatible with the emulator,
so modify the sdk_phone_arm64 product to use its own device.

Bug: 111538404
Change-Id: I57b77d7cbf503afffa8db45ad8b5ae635b4f4444
Merged-In: I57b77d7cbf503afffa8db45ad8b5ae635b4f4444
2020-04-22 11:48:14 -07:00
Steve Muckle
f83e3c3c3f support multiple boot.img files in release tools
Support for generating multiple boot.img files is required in the
release tools to enable GKI distribution/signing.

Bug: 151094943
Change-Id: I536a286d3123f35918106a52c49b1148d746370f
Merged-In: I536a286d3123f35918106a52c49b1148d746370f
2020-04-22 11:14:05 -07:00
Steve Muckle
8f670ebae7 multi boot.img support cleanups
The kernel should not be specified in INTERNAL_RECOVERYIMAGE_ARGS, since
it is already given to mkbootimg directly.

The MKBOOTIMG_KERNEL_ARG macro is unused.

Bug: 151094943
Change-Id: Ie16a7bf7d77c0436d933abbb02c6dcb9202d5fe7
Merged-In: Ie16a7bf7d77c0436d933abbb02c6dcb9202d5fe7
2020-04-22 11:13:43 -07:00
Oliver Nguyen
389cd00ca0 Export llvm-profdata for Clang coverage builds.
This tool must match the one used to compile the source code for
compatibility.

Bug: 143977934
Test: m CLANG_COVERAGE=true dist
Merged-In: I71e0e7afb05dedd5f6a09d5e4099387c6262387f
Change-Id: I71e0e7afb05dedd5f6a09d5e4099387c6262387f
(cherry picked from commit b02f7dbaa4)
2020-04-22 10:20:55 -07:00