Commit Graph

58043 Commits

Author SHA1 Message Date
Vic Yang
3ec918d342 Remove unused no_vendor_variant_vndk_check target
This was missed when we moved from a single target for checking all
VNDK libraries to using timestamp files for checking individual VNDK
libraries.

Test: Build success.
Change-Id: I3be19f6755b24fff2446449a9dbc84db9a20ea41
2020-01-28 21:01:38 -08:00
Tianjie Xu
10ef03e4fc Merge "Make the error more instructive on missing android_jar_path"
am: 8fff584906

Change-Id: Iba00bd3511671d8b45f1e225e09aca25b6816f47
2020-01-28 19:29:11 -08:00
Tianjie Xu
8fff584906 Merge "Make the error more instructive on missing android_jar_path" 2020-01-29 03:19:23 +00: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
Daniel Rosenberg
0675f9d743 Merge "Add build properties to enable casefold and prj_quota"
am: dac25a96df

Change-Id: I0ce364177d52a683a156cca012e18019a47d4c46
2020-01-28 16:04:41 -08:00
Daniel Rosenberg
dac25a96df Merge "Add build properties to enable casefold and prj_quota" 2020-01-28 23:53:25 +00:00
Steven Laver
cca79e581f Merge "Add a missing ',' in the VNDK variant identicalness check"
am: c99128cdbf

Change-Id: I6b7fa1f1211b9a49bce5e312e77f376efc7f1bb1
2020-01-28 14:52:05 -08:00
Dan Willemsen
e0f634f426 Merge "Mark (BUILD_|LOCAL_)COPY_HEADERS as [more] deprecated"
am: 5daf724d15

Change-Id: I01ad1a7e81b5079b99def9642afc1cc0350831b8
2020-01-28 14:47:31 -08:00
Colin Cross
a8008259f9 Merge "Fix building docs as part of checkbuild"
am: 35e12a7020

Change-Id: I6d3e445979e8d390841d24c01cbf37f8d6a20445
2020-01-28 14:46:48 -08:00
Steven Laver
c99128cdbf Merge "Add a missing ',' in the VNDK variant identicalness check" 2020-01-28 22:38:56 +00:00
Dan Willemsen
5daf724d15 Merge "Mark (BUILD_|LOCAL_)COPY_HEADERS as [more] deprecated" 2020-01-28 22:38:43 +00:00
Colin Cross
35e12a7020 Merge "Fix building docs as part of checkbuild" 2020-01-28 22:24:00 +00:00
Colin Cross
24c77395be Enforce LOCAL_CERTIFICATE is set in soong_app_prebuilt.mk
Missing LOCAL_CERTIFICATE produces an apkcerts.txt file that
has no key for the APK, which confuses the signing tools.
Enforce that it is set.

Bug: 147765187
Test: m apkcerts-list
Change-Id: I1299505d193deba5956954e5d9b6e4c727456b9c
2020-01-28 14:13:52 -08:00
Automerger Merge Worker
1f58479935 Merge "Add RBE support for Javac, R8, and D8 if respective env vars are set." am: 2899e4871d
Change-Id: I8fa09e31be17050b69f54ed0f102ab0a8f3d1252
2020-01-28 20:07:56 +00:00
Ramy Medhat
2899e4871d Merge "Add RBE support for Javac, R8, and D8 if respective env vars are set." 2020-01-28 19:49:05 +00:00
Steven Laver
6a9ff71894 Add a missing ',' in the VNDK variant identicalness check
The invocation of verify-vndk-libs-identical is missing a ',' between
the second and third parameters, in commit
4873e65c8d.

Change-Id: I88d230db4e6fed5939b1fe9d636d440a00773a41
2020-01-28 11:31:33 -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
Ramy Medhat
a9cc25d785 Add RBE support for Javac, R8, and D8 if respective env vars are set.
Test: aosp_crosshatch build with and without the new variables.
Change-Id: I252ff5dd8e372edf8c86e25348c8a2bfab41d70d
2020-01-28 10:25:25 -05:00
Tianjie Xu
d8df6fcc9e Merge "Resign apks contained in apex"
am: 62f97c7fb4

Change-Id: Ifa5abda286d760ef13c3fcee696f444093a0d9c5
2020-01-27 21:16:44 -08:00
Tianjie Xu
62f97c7fb4 Merge "Resign apks contained in apex" 2020-01-28 05:08:23 +00:00
Dan Willemsen
66d21d4a30 Mark (BUILD_|LOCAL_)COPY_HEADERS as [more] deprecated
We've considered these deprecated for a while, and have reduced where
they may be used, but let's actually throw warnings and call them out
specifically now.

Bug: 130719878
Test: lunch aosp_arm; m nothing   [see no warnings]
Test: lunch aosp_crosshatch; m nothing   [see LOCAL_COPY_HEADERS warnings]
Test: lunch aosp_taimen; m nothing  [see BUILD_COPY_HEADERS warnings]
Change-Id: I8c12012366d84667de0d223bbde38d8b90419e36
2020-01-27 19:45:04 -08:00
Colin Cross
57aa92a4e5 Merge "Give strip depfile a unique name, properly include it"
am: 15e0680af1

Change-Id: Ie7a6d822a08f04e3ca321f66ce5614003c2e5362
2020-01-27 16:04:48 -08:00
Treehugger Robot
15e0680af1 Merge "Give strip depfile a unique name, properly include it" 2020-01-27 23:38:00 +00:00
Tianjie Xu
f10be1e153 Merge "Add apexer and dependencies to otatools"
am: 19dbfceafd

Change-Id: Id9140f3e340ff8aae5f1061a562953bc5717c9e0
2020-01-27 15:30:14 -08: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
Daniel Rosenberg
6cc2c81f4d Add build properties to enable casefold and prj_quota
This adds the ability to format f2fs and ext4 in a way that supports
casefolding and project quotas. Project quotas require wider inodes, and
thus cannot be enable apart from at build time. Casefolding can be
configured with f2fs.fsck/tune2fs later.

Both features are enabled via inheriting emulated_storage.mk in the
device.mk

Bug: 138322712
Bug: 138321217
Test: Enable on device with related patches, view fs configuration on /data
Change-Id: Ib1ab0589006ff1b3fb7478b7e9b0a8aad71e4b09
2020-01-27 12:45:47 -08: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
Colin Cross
43e74295e0 Fix building docs as part of checkbuild
s/module_to_check/modules_to_check/

Bug: 118815658
Test: m checkbuild
Change-Id: I53e10747ed404509fd11adb72e641c702e27655b
2020-01-27 11:36:07 -08: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
Janis Danisevskis
2516500005 Merge "Remove keymaster libraries from VNDK"
am: f78c9f6e3c

Change-Id: If6720951f01b916fa8d3cd687ff43e1aef9e81fd
2020-01-27 10:05:50 -08:00
Treehugger Robot
f78c9f6e3c Merge "Remove keymaster libraries from VNDK" 2020-01-27 17:30:35 +00:00
Dan Willemsen
e2b3e1a84d Merge "Deprecate BUILD_HOST_SHARED_LIBRARY"
am: 9fe2479849

Change-Id: I2a8274203c91f107344b05793f70f8813be12d4b
2020-01-24 16:58:29 -08:00
Yifan Hong
7bf299b6db Merge "Add BOARD_USES_RECOVERY_AS_BOOT to readonly list."
am: 715c6a8794

Change-Id: Ie86e5ee8ae355cea0e4439764be3058ab2580c4d
2020-01-24 16:55:49 -08:00
Yifan Hong
46d591b9c5 Merge changes from topics "board_use_recovery_as_root_soong", "ramdisk"
am: cb0e97750a

Change-Id: Icd6796c815b2cce84af9338fcf379dda87c24883
2020-01-24 16:32:07 -08:00
Yifan Hong
40ff694e13 Export BOARD_USES_RECOVERY_AS_BOOT to soong.
am: 9a190e25d0

Change-Id: I8ca6afcac64c70b3aaae12eecd41cd8053830422
2020-01-24 16:31:38 -08: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
Yifan Hong
5e57a778cd Disallow VINTF metadata for PRODUCT_COPY_FILES
VINTF metadata must be checked by defining
DEVICE_MANIFEST_FILE and friends, instead of being
copied with PRODUCT_COPY_FILES directly.

This can be worked arond with BUILD_BROKEN_VINTF_PRODUCT_COPY_FILES.

Test: Add the following and see errors:

PRODUCT_COPY_FILES += \
    device/XXX/manifest.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/vintf/manifest.xml \
    device/XXX/manifest.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/vintf/manifest/foo.xml \
    device/XXX/manifest.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/vintf/compatibility_matrix.xml \
    device/XXX/manifest.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/vintf/manifest.xml \
    device/XXX/manifest.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/vintf/manifest/foo.xml \
    device/XXX/manifest.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/vintf/compatibility_matrix.xml \
    device/XXX/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/etc/vintf/manifest.xml \
    device/XXX/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml \
    device/XXX/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/etc/vintf/compatibility_matrix.xml \
    device/XXX/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/compatibility_matrix.xml \
    device/XXX/manifest.xml:$(TARGET_COPY_OUT_ODM)/etc/manifest.xml \
    device/XXX/manifest.xml:$(TARGET_COPY_OUT_ODM)/etc/vintf/manifest.xml \

Test: test again with BUILD_BROKEN_VINTF_PRODUCT_COPY_FILES := true

Bug: 147506249

Change-Id: Id75a9690b3c71fdc9a4e1b4e9be2caa63183cf7c
2020-01-24 15:07:35 -08: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
Colin Cross
74daa974bb Rename NativeCoverage to Native_coverage
Rename NativeCoverage to Native_coverage so it can be used as a
product_variable in Soong.

Test: m checkbuild
Change-Id: I86463a5c9b6cf4ba628cbdfb200625dc1e59e559
2020-01-24 14:27:11 -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
Automerger Merge Worker
1454e7cc5c Merge "libprotobuf-cpp-lite is removed from VNDK." am: 7ad254aee9
Change-Id: Idb64c5be511bd588704962866809036ab1be6c1a
2020-01-24 14:10:04 +00:00
Jiyong Park
7ad254aee9 Merge "libprotobuf-cpp-lite is removed from VNDK." 2020-01-24 13:59:37 +00: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
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
android-build-team Robot
ad00196e16 Version bump to QQ2A.200305.003 [core/build_id.mk]
Change-Id: Iaa087ed79e7879f7b7d8e2f344bbbd6596e73659
2020-01-23 19:21:22 +00:00
Inseob Kim
f0cec69de9 Implement BOARD_VNDK_VERSION
This allows BOARD_VNDK_VERSION to be set to old versions. With VNDK
snapshot and vendor snapshot installed, newer system and older vendor
image can be built in the same time.

Bug: 65377115
Test: 1) VNDK_SNAPSHOT_BUILD_ARTIFACTS=true m dist vndk vendor-snapshot
Test: 2) install snapshot under source tree
Test: 3) set BOARD_VNDK_VERSION and boot cuttlefish
Change-Id: Ic5fefc8bcb866584b27f021a429cb6670a2e3048
2020-01-23 12:52:25 +00:00