Commit graph

61047 commits

Author SHA1 Message Date
Xin Li
e92524e4ce Merge QQ3A.200605.002 into master
Bug: 158095402
Merged-In: I216989b052070e9f84bf1fa0f9ecc4724db50418
Change-Id: I58f2e5b4c7039a22aaecb66eabc8288ff51cd97c
2020-06-03 10:44:41 -07:00
Sasha Smundak
eefa8e954e Implement android_app_set module.
Bug: 152319766
Test: manual and builtin
Change-Id: I66edc5b423898a11dbba1c3d9796c7bd4d6b4428
Merged-In: I66edc5b423898a11dbba1c3d9796c7bd4d6b4428
2020-06-03 09:50:48 -07:00
Ulya Trafimovich
40e55c20eb Add product variable PRODUCT_BROKEN_SUBOPTIMAL_ORDER_OF_SYSTEM_SERVER_JARS.
If true, incorrect order of system server jars does not cause a build
error. The order is non-optimal if some jar X precedes its dependency Y.
In that case dexpreopt will be unable to resolve any rerefences from X
to Y.

Test: lunch cf_x86_phone-userdebug && m nothing
Test: lunch aosp_car_arm && m nothing

Bug: 140451054

Change-Id: I70efd365fa9fbd9e40792d646f8471d009164924
Merged-In: I70efd365fa9fbd9e40792d646f8471d009164924
(cherry picked from commit 17715b48f0)
2020-06-03 17:38:26 +01:00
Yo Chiang
60da88da55 Make required modules support :32 and :64 suffix
Support specifying bitness of required modules with :32 and :64 suffix,
like in PRODUCT_PACKAGES.

Bug: 155869107
Bug: 129323707
Test: TH noop
Change-Id: I47d523e4e57cb8a99629fd241a16069c0be55903
2020-06-03 18:27:42 +08:00
Yo Chiang
1b8283358e Refactor *-select-bitness-of-required-modules
* Streamline required module bitness resolution

If a module is for cross host OS, the required modules are also for that
OS.
Otherwise if the requirer module is native and the required module is
shared library or native test, then the required module resolves to the
same bitness.
Otherwise the required module resolves to both variants, if they exist.

* Factor out the common logic and merge
  <target|host|host-cross>-select-bitness-of-required-modules

This lays the road for follow-up changes to add bitness suffix support.
This slightly reduces readibility. To make up for the loss, the
bitness-resolving logic is easier to maintain since we don't have
multiple copies of *-select-bitness-of-required-modules.

Bug: 155869107
Test: check the diff of product_target_FILES and product_host_FILES
Test: check the diff of ALL_MODULES.*.REQUIRED_FROM_(TARGET|HOST)
Change-Id: Ib2f4b548535e983d621dad71cb920101111140f2
2020-06-03 18:27:20 +08:00
Treehugger Robot
150dcadc6b Merge "remove clatd.conf which is no longer required by clat daemon" am: 5638065faa am: 0208ce535d
Original change: https://android-review.googlesource.com/c/platform/build/+/1172552

Change-Id: I7ff19c2525236946f868f7fa21144a8f026af22b
2020-06-03 05:41:32 +00:00
Treehugger Robot
0208ce535d Merge "remove clatd.conf which is no longer required by clat daemon" am: 5638065faa
Original change: https://android-review.googlesource.com/c/platform/build/+/1172552

Change-Id: I216989b052070e9f84bf1fa0f9ecc4724db50418
2020-06-03 05:27:41 +00:00
Treehugger Robot
5638065faa Merge "remove clatd.conf which is no longer required by clat daemon" 2020-06-03 05:15:21 +00:00
Yo Chiang
f0ae2c5aab Merge "Revert^2 "Retire mainline.mk"" am: 2ca90c5e97 am: eb4f43e6cc
Original change: https://android-review.googlesource.com/c/platform/build/+/1322634

Change-Id: I09d8227ecb91c6a36c45ad6459089708398b4aa2
2020-06-03 03:14:57 +00:00
Yo Chiang
eb4f43e6cc Merge "Revert^2 "Retire mainline.mk"" am: 2ca90c5e97
Original change: https://android-review.googlesource.com/c/platform/build/+/1322634

Change-Id: Ia1fe27c92188cf0dc07a1dcc44e819a2babd617c
2020-06-03 03:02:49 +00:00
Yo Chiang
2ca90c5e97 Merge "Revert^2 "Retire mainline.mk"" 2020-06-03 02:47:52 +00:00
Yo Chiang
82e4bc5d0c Revert^2 "Retire mainline.mk"
This reverts commit 4003bd9def.

Reason for revert: cleaned up mainline.mk users

Bug: 157548597
Fixes: 141443017
Change-Id: I5e38620ed1c90f7188901eb148c7e3aa0596a27d
2020-06-03 02:47:34 +00:00
Oleg Aravin
8046cb0a2c Attach apk_name as a suffix for the temporary files
With this change the name of the signed and unsigned APK will be something like 'tmpadrbpp9f/tmpvl0lf2kr/tmpknja6mca_MyApk.apk' instead of 'tmpadrbpp9f/tmpvl0lf2kr/tmpknja6mca'.

The motivation for this change is a better logging and transparency what is being signed in the underlying client.

Change-Id: I32b0e93d5859ca3fb712e426705f16d329d71f0e
2020-06-02 16:03:21 -07:00
Steve Muckle
2335d76ada refactor kernel module build, add version support
Refactor the build support for kernel modules. This refactoring is
leveraged to add support for directories of kernel modules in each
partition. To add a directory of kernel modules, define
BOARD_KERNEL_MODULE_DIRS to include the directory name, for example:

BOARD_KERNEL_MODULE_DIRS := 5.4

The build will then check all the usual kernel module related macros
with an extension of _5.4, for example you can define

BOARD_VENDOR_KERNEL_MODULES_5.4 := <modules to copy>
BOARD_VENDOR_KERNEL_MODULES_ARCHIVE_5.4 = <path to archive file>
BOARD_VENDOR_KERNEL_MODULES_LOAD_5.4 := <modules for load list>

Bug: 157645635
Change-Id: I1687d0ec85c1dcf21350350623b4689aba3f6717
2020-06-02 15:17:26 -07:00
Steve Muckle
c88a8c88e4 move BOARD_RECOVERY_KERNEL_MODULES_LOAD default
Moving this makes each of the partition's kernel module Makefile
generation more similar, enabling a forthcoming cleanup/refactoring.

If recovery-is-boot and there are kernel modules defined in
BOARD_GENERIC_RAMDISK_KERNEL_MODULES, those kernel modules will
now be included in the default assignment to
BOARD_RECOVERY_KERNEL_MODULES_LOAD. If this is not desired then
BOARD_RECOVERY_KERNEL_MODULES_LOAD may simply be set to
BOARD_RECOVERY_KERNEL_MODULES (or a custom list of recovery kernel
modules to load).

Bug: 157645635
Change-Id: Ia1392b7d20d07cee75420edd95dcee1dc825516e
2020-06-02 15:17:15 -07:00
Steve Muckle
1013d789de move module list creation outside conditionals
Currently the two special-case calls to create just a module load list
(as opposed to copying a set of modules and creating a module load list)
are inside checks that the related board macro for the module set is not
empty.

While it would be incorrect to create a non-empty module load list with
an empty set of modules, this error would quickly surface at runtime.
More importantly, moving these out will permit refactoring this code to
clean it up.

Bug: 157645635
Change-Id: I199788d49072d4c59737b3ef2c75546852cf3e36
2020-06-02 15:17:04 -07:00
Steve Muckle
f291097221 fix reference to BOARD_ODM_MODULES_LOAD
This check is meant to initialize BOARD_ODM_KERNEL_MODULES_LOAD to
BOARD_ODM_KERNEL_MODULES if BOARD_ODM_KERNEL_MODULES_LOAD is empty.

Bug: 157645635
Change-Id: I9c8ac0e64bb002e926d15b446a63801d7cfa9911
2020-06-02 15:16:54 -07:00
Treehugger Robot
c47b36bbb9 Merge "Remove unused check-api rule" am: fa9ea4b8b0 am: 6231dd8584
Original change: https://android-review.googlesource.com/c/platform/build/+/1322795

Change-Id: Ia66d72bf145458e7b570b47b766a4bc6a4aae164
2020-06-02 19:40:09 +00:00
Treehugger Robot
6231dd8584 Merge "Remove unused check-api rule" am: fa9ea4b8b0
Original change: https://android-review.googlesource.com/c/platform/build/+/1322795

Change-Id: I5e1d6dd6629d51410a15620e22d0460d9c39c68b
2020-06-02 19:27:03 +00:00
Treehugger Robot
fa9ea4b8b0 Merge "Remove unused check-api rule" 2020-06-02 19:11:42 +00:00
Aurimas Liutikas
9c5b07966e Remove unused check-api rule
Change-Id: I0297b226d066e99ee4fc4c2b22e160eafc7f5a8a
Test: Treehugger?
2020-06-02 17:01:52 +00:00
Maciej Żenczykowski
836cbf2943 remove clatd.conf which is no longer required by clat daemon
Test: builds
Bug: 144730808
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: If5d9e575c0c784fe121d8aff533354d3c91ecff4
2020-06-02 10:32:45 +00:00
Josh Gao
67e0295833 Rename adbd_system_binaries to adbd_system_api.
This is going to include libraries as well, so rename to reflect this.

Bug: http://b/157709367
Test: treehugger
Change-Id: I94625a6343e18032d8607cf8c58bde49d64db85c
2020-06-01 18:57:25 -07:00
sophiez
a81ee59b74 Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set.
Test: build/soong/soong_ui.bash --make-mode SKIP_ABI_CHECKS=true TARGET_PRODUCT=aosp_cf_x86_phone TARGET_BUILD_VARIANT=userdebug droid dist DIST_DIR=/usr/local/google/home/sophiez/my_dist_dir EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true CLANG_COVERAGE=true SKIP_BOOT_JARS_CHECK=true tests

Change-Id: I778da9ca7897752274744eca5530412c146fac96
2020-06-01 12:18:54 -07:00
Anton Hansson
4272b24836 [automerger skipped] Merge "releasetools: Add signapk as required modules" into rvc-dev am: a973323a9d -s ours
am skip reason: Change-Id Ic0cff0a21258cb1e7d1ced5553a940dcf5cd6d04 with SHA-1 3e4b44868b is in history

Change-Id: I0959700c23cf61d2770d7b52ef2470f558486ed1
2020-06-01 18:24:09 +00:00
Anton Hansson
a973323a9d Merge "releasetools: Add signapk as required modules" into rvc-dev 2020-06-01 17:53:21 +00:00
Ulyana Trafimovich
9e92b1788e Merge "Provide library path to android.test.base for dexpreopt." am: 1c294551b4 am: 25ed6113d5
Change-Id: Ie76d17154ac74ae19abf4ff75d5265aaa68315f4
2020-06-01 15:29:22 +00:00
Ulyana Trafimovich
25ed6113d5 Merge "Provide library path to android.test.base for dexpreopt." am: 1c294551b4
Change-Id: Ia307ddb9cffe74e9eaf7009924617b41d4facb76
2020-06-01 15:18:13 +00:00
Ulyana Trafimovich
1c294551b4 Merge "Provide library path to android.test.base for dexpreopt." 2020-06-01 15:05:25 +00:00
Ulya Trafimovich
0b0cf4c411 Provide library path to android.test.base for dexpreopt.
It may be needed in class loader context if the target API version
is less than 30.

Test: lunch aosp_cf_x86_phone-userdebug && m
Change-Id: Ifa5ab18d1dc322184100207ad6eee4bdcf74deb0
2020-06-01 12:29:27 +01:00
Yo Chiang
01a66620c0 Merge "releasetools: Fix non-existent required dependency" am: 61e1cc7317 am: 5e113d40d0
Change-Id: I236286dd8ee61e0163a941e6adb1a645489296eb
2020-06-01 06:59:20 +00:00
Yo Chiang
5e113d40d0 Merge "releasetools: Fix non-existent required dependency" am: 61e1cc7317
Change-Id: Ic9ecfd4e3ce60db8a730e58bac28a20fa151cd61
2020-06-01 06:42:21 +00:00
Yo Chiang
61e1cc7317 Merge "releasetools: Fix non-existent required dependency" 2020-06-01 06:31:07 +00:00
J. Avila
2b6177640d [automerger skipped] Merge "Add build support for LZ4 ramdisks" into rvc-dev am: 5ea1cf103f -s ours
am skip reason: Change-Id Iac9538e6ee6ec51e6b487de2101f53bb5d9c54c8 with SHA-1 3f6560e626 is in history

Change-Id: Icac4f047a485e428aad40d21fdbafce2e11c17a3
2020-05-31 16:04:39 +00:00
J. Avila
5ea1cf103f Merge "Add build support for LZ4 ramdisks" into rvc-dev 2020-05-31 15:55:08 +00:00
Baligh Uddin
32bd6959cd [automerger skipped] Add apksigner to otatools.zip am: 1325034c81 -s ours
am skip reason: Change-Id I95c7001ad520d6b4a415d21ffdef55152b0e82b2 with SHA-1 ab25b2dcfa is in history

Change-Id: Ic18ee8211b6ecfb57fe2f28b6e00a7b75aa7f530
2020-05-30 05:54:37 +00:00
J. Avila
9600ace371 Add build support for LZ4 ramdisks
Ramdisks are currently compressed using gzip, which is generally
smaller, but slower to decompress than lz4. Provide an option for an
lz4 scheme to reduce the time taken to unpack initramfs during boot.

Bug: 156129966
Signed-off-by: J. Avila <elavila@google.com>
Merged-In: Iac9538e6ee6ec51e6b487de2101f53bb5d9c54c8
Change-Id: Iac9538e6ee6ec51e6b487de2101f53bb5d9c54c8
2020-05-29 22:46:31 +00:00
Treehugger Robot
3e63c8cb1b [automerger skipped] Merge "remove spurious comma from module-load-list-copy-paths call" am: 6be7b57ce7 am: 7599287f00 -s ours
am skip reason: Change-Id I7d1736da1599e265793173a741053d8a09f1622f with SHA-1 8177ae20f3 is in history

Change-Id: I1318742eec5d7fe73c0498ec7804aecf3f734619
2020-05-29 22:38:29 +00:00
Treehugger Robot
7599287f00 Merge "remove spurious comma from module-load-list-copy-paths call" am: 6be7b57ce7
Change-Id: I07000da98825fb99ddf2947dd5dcc1a04d52bc87
2020-05-29 22:24:44 +00:00
Treehugger Robot
6be7b57ce7 Merge "remove spurious comma from module-load-list-copy-paths call" 2020-05-29 22:08:11 +00:00
Treehugger Robot
e6772e5e53 Merge "Add apksigner to otatools.zip" am: d6eb072c9f am: 558cc4bd0d
Change-Id: I87af6d0f4cf113e411472e9a930196918aca6c03
2020-05-29 21:52:48 +00:00
J. Avila
e947fe92ae Merge "Add build support for LZ4 ramdisks" am: bc4d5bdb87 am: bfc7440c43
Change-Id: I3e8c09105cf9173b7f9a448598ac2d6c87cc2729
2020-05-29 21:52:27 +00:00
Jiyong Park
c96b261f59 Merge changes from topics "remove_bootimage_sysprops", "sysprop" am: 6dd5383c37 am: 04799633dd
Change-Id: Iddb4cfd419dc0f68e15cb62f2545d8bc178b42ca
2020-05-29 21:52:11 +00:00
Baligh Uddin
1325034c81 Add apksigner to otatools.zip
BUG: 157735036
Test: Local build.
Change-Id: I3778021f94236b0ac09a33149f2872fb5f740be2
Merged-In: I95c7001ad520d6b4a415d21ffdef55152b0e82b2
2020-05-29 21:49:39 +00:00
Treehugger Robot
558cc4bd0d Merge "Add apksigner to otatools.zip" am: d6eb072c9f
Change-Id: I2c1b523610d2c177e0ac42e6d357648c1bb68cfa
2020-05-29 21:44:50 +00:00
J. Avila
bfc7440c43 Merge "Add build support for LZ4 ramdisks" am: bc4d5bdb87
Change-Id: Id686eef86540752f38fb28fb686907414e8e6f34
2020-05-29 21:43:58 +00:00
Jiyong Park
04799633dd Merge changes from topics "remove_bootimage_sysprops", "sysprop" am: 6dd5383c37
Change-Id: I698ba5f0e6166b1751d6acdedd176a5c939f1dc9
2020-05-29 21:43:03 +00:00
TreeHugger Robot
0c6b790cd0 Merge "iorap: Add a config mk for large memory device." into rvc-dev am: 270308af15
Change-Id: Iea1f4698d48db34bd37983927d3f576e0b0926a4
2020-05-29 21:39:50 +00:00
Treehugger Robot
d6eb072c9f Merge "Add apksigner to otatools.zip" 2020-05-29 21:28:11 +00:00
TreeHugger Robot
270308af15 Merge "iorap: Add a config mk for large memory device." into rvc-dev 2020-05-29 21:27:26 +00:00