Commit Graph

57164 Commits

Author SHA1 Message Date
Tianjie Xu
83bd55c1db Assets should be optional in apex repacking
We should only provide the --assets_dir option when the assets directory
is available in the original apex.

Bug: 148452817
Test: unit tests pass
Change-Id: I44308b80a43ff3f441223f0ecc248991d1d83f31
2020-01-29 11:40:42 -08:00
Tianjie Xu
a25d76f2c8 Add explicitly merge_zips to otatools package
Since it's under soong/out/host, we need to explicitly copy it into the
otatools.zip

Bug: 146508800
Test: build and check otatools.zip
Change-Id: I83e201601cf03b6eb01ead912a78f22f750aa4be
2020-01-28 19:17:35 -08:00
Tianjie Xu
61a792f323 Make the error more instructive on missing android_jar_path
So when $ANDROID_BUILD_TOP is missing, the error message print out the
path of the missing file; instead of a type error.

Bug: 148452817
Test: check result with missing ANDROID_BUILD_TOP
Change-Id: I5f841f6626eb3843364f20e78b278d3244505396
2020-01-28 10:58:14 -08:00
Tianjie Xu
62f97c7fb4 Merge "Resign apks contained in apex" 2020-01-28 05:08:23 +00:00
Treehugger Robot
15e0680af1 Merge "Give strip depfile a unique name, properly include it" 2020-01-27 23:38:00 +00:00
Tianjie Xu
19dbfceafd Merge "Add apexer and dependencies to otatools" 2020-01-27 23:21:52 +00:00
Colin Cross
3e87e83557 Give strip depfile a unique name, properly include it
$(LOCAL_BUILT_MODULE).d may conflict with the .d file for a .o file,
use $(LOCAL_BUILT_MODULE).strip.d.  Also pass the required second
arg to include-depfile.

Bug: 148387048
Test: m checkbuild
Change-Id: I1f5f4c38010294a12d6777439b0f66c0102c1c96
2020-01-27 22:06:21 +00:00
Tianjie Xu
88a759d651 Resign apks contained in apex
Some apex payload images contain apk files. And these apks need to be
signed during the signing processed when sign_target_files_apks is
called. To support the signing, we can extract the payload and repack
the apex file with the (de)apexer tool. Add the signing support in the
apex_util.

Bug: 146508800
Test: unit tests pass, run sign_apex, sign_target_files_apks
Change-Id: If6d58975248709a144b07dbabf47c27916e5695e
2020-01-27 19:48:39 +00:00
Tianjie Xu
eb8a0a0036 Add apexer and dependencies to otatools
We need them to extract and repack the apex file when signing
the apex.

Bug: 146508800
Test: build
Change-Id: Ib38055eac24f28ac59610d03275de05b77d3eeb0
2020-01-27 11:05:54 -08:00
Treehugger Robot
f78c9f6e3c Merge "Remove keymaster libraries from VNDK" 2020-01-27 17:30:35 +00:00
Dan Willemsen
9fe2479849 Merge "Deprecate BUILD_HOST_SHARED_LIBRARY" 2020-01-25 00:09:48 +00:00
Treehugger Robot
715c6a8794 Merge "Add BOARD_USES_RECOVERY_AS_BOOT to readonly list." 2020-01-25 00:03:22 +00:00
Janis Danisevskis
e8484f2160 Remove keymaster libraries from VNDK
These keymaster libraries constitute a service to vendors
who want/need to implement a keymaster trusted app, or want
to wrap an older keymaster HAL when updating an older device
to a newer Android version. It is not necessary to implement
or link against these libraries to be Android or Treble
compliant. Many vendors have completely independent
implementations of keymaster. Vendors should be able to
provide there own versions of these libraries or ship without
them entirely. /system does not depend on /vendor to have
a compatible version of these libraries.

Test: N/A
Bug: 139955894
Merged-In: I9286b36d26f09e26763df17758f9bec9e2b60ec8
Change-Id: I9286b36d26f09e26763df17758f9bec9e2b60ec8
2020-01-24 14:44:36 -08:00
Yifan Hong
cb0e97750a Merge changes from topics "board_use_recovery_as_root_soong", "ramdisk"
* changes:
  Add e2fsck_ramdisk for VAB devices
  Export BOARD_USES_RECOVERY_AS_BOOT to soong.
2020-01-24 22:39:41 +00:00
Yifan Hong
8d29737259 Add BOARD_USES_RECOVERY_AS_BOOT to readonly list.
Test: builds
Change-Id: I391e0d168c79e84c1a2acd4fe693e3ed9fbddb53
2020-01-24 14:28:03 -08:00
Dan Willemsen
084c6ef6fa Deprecate BUILD_HOST_SHARED_LIBRARY
There are no common users left.

Also add some sanity checks to ensure that people don't attempt to use
LOCAL_IS_HOST_MODULE := true with the BUILD_(STATIC|SHARED)_LIBRARY
module types (I'm not sure it would work, but it definitely wouldn't be
good).

Bug: 130722971
Test: treehugger
Test: check the warnings on the build_test builds from treehugger
Change-Id: I3e571ef80379955149adbceff4500e51dfa016c6
2020-01-24 13:21:21 -08:00
Jiyong Park
7ad254aee9 Merge "libprotobuf-cpp-lite is removed from VNDK." 2020-01-24 13:59:37 +00:00
Yifan Hong
04d4c08929 Add e2fsck_ramdisk for VAB devices
e2fsck_ramdisk is critical for VAB devices to boot
after an OTA in case of corruption in metadata partition.

Test: pass
Bug: 147347110
Change-Id: I44ce456c11961ec978dcb4e68c32d72c1fab0c4d
2020-01-23 13:21:09 -08:00
Yifan Hong
9a190e25d0 Export BOARD_USES_RECOVERY_AS_BOOT to soong.
Test: pass
Bug: 147347110
Change-Id: I4ba4f626f02c42b1700a971326557abd23da8340
2020-01-23 13:21:09 -08:00
Jiyong Park
d918cadcc0 libprotobuf-cpp-lite is removed from VNDK.
It is demoted to vendor_available library. Therefore it will be
installed to /vendor/lib[64] instead of /system/lib[64]/vndk.

Bug: 147780271
Test: m
Merged-In: I40a94a3ecf55592b8e2f83f43070fa958c532cef
Change-Id: I40a94a3ecf55592b8e2f83f43070fa958c532cef
(cherry picked from commit 87889b0d4d)
2020-01-23 13:11:09 +09:00
Treehugger Robot
4b26ce076a Merge "Add android.hardware.secure_element@1.2" 2020-01-23 02:00:02 +00:00
Yifan Hong
84c1309730 Merge "Do not check VINTF if no files" 2020-01-22 22:51:04 +00:00
Oliver Nguyen
125f7dc84d Merge "Add CLANG_COVERAGE build flag to soong config." 2020-01-22 22:34:35 +00:00
Treehugger Robot
02b1498d5a Merge "Turn on PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE if PRODUCT_SHIPPING_API_LEVEL > 29" 2020-01-22 00:36:40 +00:00
Treehugger Robot
839eb98241 Merge "Restore "Linktype check for native:product"" 2020-01-22 00:16:50 +00:00
Justin Yun
2bfe0a1a25 Restore "Linktype check for native:product"
Similar to native:vendor, native:product can use VNDK libs but not
vndk_private.
It is activated when PRODUCT_PRODUCT_VNDK_VERSION is set.

This restores the reverted commit
4e7e76fe5a (aosp/1197274).
The problem of the original CL was assuming no modules have both
LOCAL_PRODUCT_MODULE and LOCAL_USE_VNDK in the old implementations.
But many vendor modules in the targets without setting
PRODUCT_PRODUCT_VNDK_VERSION in old branches had both flags that
caused link failures.
To make it no-op without PRODUCT_PRODUCT_VNDK_VERSION, I defined
LOCAL_USE_VNDK_PRODUCT that is set to true if
PRODUCT_PRODUCT_VNDK_VERSION is defined and LOCAL_PRODUCT_MODULE is
true.

Bug: 146620523
Test: build with PRODUCT_PRODUCT_VNDK_VERSION := current
Change-Id: I344c7dc1c47f08706c101e486ff07c3f10aff8ac
2020-01-22 00:16:25 +00:00
Yifan Hong
4de0c0906d Merge "Remove BUILT_VENDOR_MANIFEST variable." 2020-01-21 21:33:18 +00:00
Peter Collingbourne
b1d7545e1b Merge "Update make build system for dynamic unwinder." 2020-01-21 21:28:44 +00:00
Yifan Hong
af9b0701e3 Do not check VINTF if no files
Do not check VINTF integrity / compatibility if
no files are built to /system/etc/vintf/* or /vendor/etc/vintf/*.

Test: m check-vintf-all on gsi_gms_arm64
Test: m check-vintf-all on coral

Fixes: 147749718
Fixes: 148007775

Change-Id: I874d1558e0b891b9d307eec536b1071d382a43f5
2020-01-21 13:21:52 -08:00
Justin Yun
d7466880dc Merge "Revert "Linktype check for native:product"" 2020-01-20 07:42:33 +00:00
Justin Yun
dd5401713c Revert "Linktype check for native:product"
This reverts commit 4e7e76fe5a.

Reason for revert: build breaks (bid: 6147225) and postsubmit test fails.
There are some modules that have both "product_specific: true" and "vendor_available: true", which tags the module as "native:product" unintentionally.
We need to clean up these cases first and revisit this CL.

Bug: 146620523
Bug: 147987741
Change-Id: Ib07543235d72a135b6b732aaa909c147d2df832b
2020-01-20 07:39:41 +00:00
Treehugger Robot
3cff56942a Merge "libprotobuf-cpp-full is removed from VNDK." 2020-01-20 07:32:36 +00:00
Treehugger Robot
2e7a67bde7 Merge "Linktype check for native:product" 2020-01-20 01:23:00 +00:00
Justin Yun
4e7e76fe5a Linktype check for native:product
Similar to native:vendor, native:product can use VNDK libs but not
vndk_private.
It is activated when PRODUCT_PRODUCT_VNDK_VERSION is set.

Bug: 146620523
Test: build with PRODUCT_PRODUCT_VNDK_VERSION := current
Change-Id: Icfd94dfc30e77581991799d9e2f408f57da22cea
2020-01-19 23:46:47 +00:00
Vic Yang
7c42c3f55e Merge "Don't check VNDK variants when asan is used" 2020-01-18 04:45:49 +00:00
Vic Yang
90c3aca9bf Don't check VNDK variants when asan is used
Bug: 147911208
Test: Build with SANITIZE_TARGET=address
Change-Id: I161da92d2ed5c59ccf404cf93e04734cc85c2df9
2020-01-17 15:30:44 -08:00
Treehugger Robot
5023711e9d Merge "Always check VNDK variant identicalness" 2020-01-17 18:45:41 +00:00
Yifan Hong
0188eb5d25 Merge changes from topic "build_time_vintf"
* changes:
  Reland "Improve BUILT_ASSEMBLED_*_MANIFEST checks"
  Reland "Add check-vintf-all target."
2020-01-17 18:37:37 +00:00
Treehugger Robot
48b67473c6 Merge "Track addition of internal classes derived from OpenJDK 9+181." 2020-01-17 16:41:48 +00:00
Tobias Thierer
c6cb1c3815 Track addition of internal classes derived from OpenJDK 9+181.
Bug: 147483640
Test: Treehugger

Change-Id: Ib934f0fe4e2aeadcc83bbae3c2efaf45a38081d4
2020-01-17 14:40:22 +00:00
Treehugger Robot
345dad3c36 Merge "Allow codename.fingerprint format for minSdkVersion" 2020-01-17 07:43:31 +00:00
Hsin-Yi Chen
4367e6cc51 Merge "Compare existing ABI dump list with LSDUMP_PATHS" 2020-01-17 02:09:39 +00:00
Treehugger Robot
951ae30d56 Merge "Add strict module check to package-modules.mk" 2020-01-17 00:03:07 +00:00
Wei Wang
add214cdee Merge "Add stable aidl power HAL" 2020-01-16 22:35:42 +00:00
Baligh Uddin
7ce531de8e Allow codename.fingerprint format for minSdkVersion
Use codename.fingerprint format for minSdkVersion if it is unset
in the manifest and
UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT=true.

BUG: 130541924
2020-01-16 10:04:55 -08:00
Jiyong Park
8da1b9add3 libprotobuf-cpp-full is removed from VNDK.
It is demoted to vendor_avaialble library. Therefore it will be
installed to /vendor/lib[64] instead of /system/lib[64]/vndk.

Bug: 147780271
Test: m
Change-Id: I9db6147d6e6005177660e56e3ee42475c103d198
2020-01-17 00:55:52 +09:00
Dan Willemsen
09c11073ac Add strict module check to package-modules.mk
The test lists keep getting out of date. Add a per-caller option so that
once they're clean on all builds we can stop them from regressing.

Test: add my_modules_strict := {true,false,,foo} to user
Change-Id: I3e09a8cbe5a07bbbff042b26cea7041c331dde96
2020-01-15 20:54:13 -08:00
Yifan Hong
2e4f20f540 Merge "device_(manifest|matrix).xml -> vendor_*" 2020-01-16 04:09:08 +00:00
Hsin-Yi Chen
62de555119 Compare existing ABI dump list with LSDUMP_PATHS
This commit fixes the check for redundant files in prebuilts/abi-dumps.
Some ABI dump file names are different from the module names. The list
of existing files should be compared with LSDUMP_PATHS which are the
files generated by soong.

This commit also adds the check for the files in
prebuilts/abi-dumps/platform.

Bug: 147409497
Test: make
Change-Id: If304afb116e9b5d3cb7ceaf74822d5a19ebe1a35
2020-01-16 10:46:30 +08:00
Treehugger Robot
4026911ba1 Merge "Add Identity Credential 1.0" 2020-01-15 23:19:03 +00:00