Commit graph

57703 commits

Author SHA1 Message Date
Yifan Hong
96d8391a6a Merge "Disallow VINTF metadata for PRODUCT_COPY_FILES"
am: 67f58406ee

Change-Id: I2460c310b37195b47c01268c4e6400e297fd334f
2020-01-30 03:22:49 -08:00
Tianjie Xu
06bb37219c Merge "Assets should be optional in apex repacking"
am: ba5de57120

Change-Id: I68a784cd96cf22265524e1bdf51bd2caea93061a
2020-01-30 03:22:18 -08:00
Nikita Ioffe
c3d679bb88 Merge "Don't inherit userspace_reboot.mk from mainline_system.mk" 2020-01-30 11:05:53 +00:00
Treehugger Robot
86b4532286 Merge "Add mke2fs.conf to otatools" 2020-01-30 05:06:32 +00:00
Baligh Uddin
6a8234bf43 Add mke2fs.conf to otatools
BUG: 148452817
2020-01-29 17:42:59 -08:00
Yifan Hong
9ba0f7de8c Move VAB properties to vendor.
Bug: 148569015
Test: apply OTA
Change-Id: I926fd1dc861e36c17f27e44a160b2c64db8bd39b
2020-01-29 17:39:42 -08:00
Yifan Hong
67f58406ee Merge "Disallow VINTF metadata for PRODUCT_COPY_FILES" 2020-01-30 00:50:59 +00:00
Nikita Ioffe
18548cccc8 Don't inherit userspace_reboot.mk from mainline_system.mk
Test: Checked that userspace_reboot.mk is included in device makefiles
Test: build
Bug: 135984674
Change-Id: If910e2a6baf8acaafc8bafdf8193ba7237f66f1a
Merged-In: If910e2a6baf8acaafc8bafdf8193ba7237f66f1a
(cherry picked from commit 0f38beca94)
2020-01-30 00:11:11 +00:00
Tianjie Xu
ba5de57120 Merge "Assets should be optional in apex repacking" 2020-01-29 22:59:30 +00:00
Chih-Hung Hsieh
fa07aced4a Merge "Add new C++ and Java warning patterns"
am: 502828aaa6

Change-Id: I11cc5d5382add37b1bb1c11213820348b3c36d6e
2020-01-29 13:39:44 -08:00
Dan Willemsen
4c3a01f105 Mark BUILD_HOST_EXECUTABLE as deprecated
The last common user has been removed

Bug: 130696912
Test: treehugger
Change-Id: I7920719edfdef295f4136326445836053db5adf8
2020-01-29 13:27:18 -08:00
Treehugger Robot
502828aaa6 Merge "Add new C++ and Java warning patterns" 2020-01-29 21:26:02 +00:00
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
Chih-Hung Hsieh
b09530bd65 Add new C++ and Java warning patterns
Test: warn.py --url=http://cs/android --separator='?l=' build.log > warnings.html
Test: warn.py --gencsv build.log > warnings.csv
Change-Id: I11457fdab7abd475e835367582c0b9aab11cfe6f
2020-01-29 11:01:36 -08:00
Colin Cross
30c91a72ed Merge "Enforce LOCAL_CERTIFICATE is set in soong_app_prebuilt.mk"
am: 5c3725510a

Change-Id: Ic55c310a7abcc98b995e774aaf591d69605eed78
2020-01-29 09:59:01 -08:00
Treehugger Robot
5c3725510a Merge "Enforce LOCAL_CERTIFICATE is set in soong_app_prebuilt.mk" 2020-01-29 17:42:51 +00:00
Vic Yang
64d0b72f81 Merge "Remove unused no_vendor_variant_vndk_check target"
am: 526551f013

Change-Id: Id13c047df6da98ce0ab23b625c1578c2db2d3571
2020-01-28 23:04:41 -08:00
Treehugger Robot
526551f013 Merge "Remove unused no_vendor_variant_vndk_check target" 2020-01-29 06:54:01 +00:00
Baligh Uddin
7d88e726cc Merge "Add explicitly merge_zips to otatools package"
am: 0434412bcd

Change-Id: I2b536927f621f7d7cc6fcd0fdc246433bcea4db4
2020-01-28 22:24:38 -08:00
Baligh Uddin
0434412bcd Merge "Add explicitly merge_zips to otatools package" 2020-01-29 06:16:16 +00:00
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