Commit Graph

59066 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
85ec063adf Merge changes I465ea6c9,I57b77d7c am: be01cf841e
Change-Id: I4b650bec84a2e21c2e5ef947839eb3d18ecc755c
2020-04-22 04:05:45 +00:00
Treehugger Robot
be01cf841e Merge changes I465ea6c9,I57b77d7c
* changes:
  generate multiple boot.img files in aosp_arm64
  create emulator_arm64 device for sdk_phone_arm64 to use
2020-04-22 03:45:49 +00:00
android-build-team Robot
6c86a509d1 Version bump to QQ3A.200605.002 [core/build_id.mk]
Change-Id: Id42329c0e71a750d7634ac6860c696bb26bacb5b
2020-04-22 00:53:25 +00:00
Tianjie Xu
9ec3777b95 Merge "Update the argument when signing aftl" am: f53f313c36
Change-Id: I7d820dfc64815784821eb07fd46eb1ff484faa86
2020-04-21 22:47:01 +00:00
Dan Willemsen
fe4be56b3b Merge changes from topic "mk-rm-obsolete" am: 85dbb754e2
Change-Id: I08617313fa97764bf5100274c81f669ab86db13c
2020-04-21 22:46:04 +00:00
Dan Willemsen
c4fb07d615 Remove AUX support am: 58634e1482
Change-Id: I979e3002653f5f862c536ec8f2b3f5c1c3991773
2020-04-21 22:46:01 +00:00
Tianjie Xu
f53f313c36 Merge "Update the argument when signing aftl" 2020-04-21 22:39:31 +00:00
Tianjie
20dd8f20b1 Update the argument when signing aftl
The arguments transparency_log_servers and transparency_log_pub_keys
have been merged. Update the caller in the OTA script accordingly.

Also disable the test to contact aftl server until we have
a public server.

Bug: 153940575
Test: check the argument
Change-Id: If6a7e7d644884d395c75c2fcdfd6aa7c2380d851
2020-04-21 22:38:55 +00:00
Dan Willemsen
85dbb754e2 Merge changes from topic "mk-rm-obsolete"
* changes:
  Obsolete unused module types
  Remove AUX support
2020-04-21 22:35:36 +00:00
Treehugger Robot
cb1cefee02 Merge "support multiple boot.img files in release tools" am: dd9690162f
Change-Id: I3769858b5ae77e42df2db2c14dc0eb5463bf51df
2020-04-20 08:30:27 +00:00
Treehugger Robot
dd9690162f Merge "support multiple boot.img files in release tools" 2020-04-20 08:13:36 +00:00
Steve Muckle
0959fbfd2e 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
2020-04-20 05:31:15 +00:00
Steve Muckle
1e1514a5ef 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
2020-04-20 05:30:25 +00:00
Dan Willemsen
58634e1482 Remove AUX support
This was deprecated in R, which has now branched, and there aren't any
users on master.

Test: build-aosp_crosshatch.ninja is the same (except for the removal of the empty auxiliary target)
Test: treehugger
Change-Id: I306156ab7f91cd4a2258554b4215766c99cd12d1
2020-04-18 21:00:18 -07:00
Dan Willemsen
efee0692d4 Obsolete unused module types
These were deprecated in R, which has now branched, and there aren't any
users on master.

Test: build-aosp_crosshatch.ninja is identical
Test: treehugger
Change-Id: I6286880e45c0facbae56f9a16e8cfcbde12f121c
2020-04-18 21:00:18 -07:00
Jingwen Chen
782ceb4d76 Merge "Use prebuilt dir variable for BISON_PKGDATADIR, instead of an absolute path." am: 5bc04cfa7d
Change-Id: Ie29a239950ab60ea4ded756cb29794e8682e20eb
2020-04-19 01:25:34 +00:00
Jingwen Chen
5bc04cfa7d Merge "Use prebuilt dir variable for BISON_PKGDATADIR, instead of an absolute path." 2020-04-19 01:03:46 +00:00
Jingwen Chen
e8befad090 Use prebuilt dir variable for BISON_PKGDATADIR, instead of an absolute path.
Test: m

Signed-off-by: Jingwen Chen <jingwen@google.com>
Change-Id: I329d8f685f60fd05727b65aecb82eb03807e9201
2020-04-18 14:38:25 +00:00
Anton Hansson
319874dc9c Merge "Remove _API_FILE variables" am: c94417e9a7
Change-Id: Ifff8acce94edc2138c0bd3c604392089ca2e4fce
2020-04-18 09:41:00 +00:00
Anton Hansson
c94417e9a7 Merge "Remove _API_FILE variables" 2020-04-18 09:13:49 +00:00
Treehugger Robot
db1f79e6d6 Merge "Add fsverity release cert" am: 2162d25b8f
Change-Id: Ida1c00511fd2627ca5e448abf5eb55673d5a21e3
2020-04-18 02:37:15 +00:00
Treehugger Robot
2162d25b8f Merge "Add fsverity release cert" 2020-04-18 02:17:20 +00:00
Kousik Kumar
2d1430e51c Merge "Use soong_zip instead of jar to generate .jar files in javac actions" am: 1d56417af0
Change-Id: I2d4af49bf3a300d3735fe5d1d6dce1a0d721f792
2020-04-17 22:14:56 +00:00
Kousik Kumar
1d56417af0 Merge "Use soong_zip instead of jar to generate .jar files in javac actions" 2020-04-17 21:51:31 +00:00
Anton Hansson
ac1887227d Remove _API_FILE variables
There are no known usages of these variables, and they've been
incorrectly set for a long time.

The phony for $(LOCAL_MODULE) in droiddoc to build the api txt
has been moved to soong.

Bug: 152479829
Test: m
Change-Id: I31742e50d1af42fb899c7a3436af5647bd90cc47
2020-04-17 20:27:41 +01:00
Victor Hsieh
d24991a26e Add fsverity release cert
The release cert helps verifying CTS in a release build.

Bug: 153112812
Test: build, reboot, see a new key in /proc/keys
Change-Id: I6d8f4af6b1b0c023b668e81b7a1c71c7583d93d9
2020-04-17 10:27:42 -07:00
Kousik Kumar
7d61116cc1 Use soong_zip instead of jar to generate .jar files in javac actions
This is to make the jar-output deterministic so that we can get
cache-hits for r8/d8 actions from RBE.

Change-Id: I911ee702fa5dabfe7122e82b21f78c811a0c960d
Test: m droid checkbuild
2020-04-16 18:23:32 -07:00
Yo Chiang
85e68e75f1 Merge "Check ELF prebuilts in PRODUCT_COPY_FILES" am: 2cbcf3bda2
Change-Id: Iaf87ead13950c6f06ad3adcdb19b928833b156a1
2020-04-17 01:21:26 +00:00
Yo Chiang
2cbcf3bda2 Merge "Check ELF prebuilts in PRODUCT_COPY_FILES" 2020-04-17 01:06:32 +00:00
Steve Muckle
9793cf6c8a 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
2020-04-16 17:54:25 -07:00