Commit Graph

67777 Commits

Author SHA1 Message Date
Ulya Trafimovich
78d96e8742 Add missing dependency on aapt.
The missing dependency on AAPT did not cause build failures in AOSP,
because the build order happens to be such that AAPT is always built by
the time it's needed. But this is accidental and needs to be fixed.

Bug: 183010666
Bug: 132357300
Test: treehugger
Change-Id: I170e878bf36aafbdb93e9ba54faffd455d3e33c2
Merged-In: I8c78e48345bee5b77de41af03bdac77c402d04a1
2021-03-18 12:36:15 +00:00
Po Hu
db9f6e13c8 Fix build break for Android.bp dex_import
Error message is:
'out/target/common/obj/JAVA_LIBRARIES/x_intermediates/classes.jar',
needed by 'out/target/common/obj/JAVA_LIBRARIES/x_intermediates/jav
alib.jar', missing and no known rule to make it;

Soong Android.mk generated does not define LOCAL_SOONG_CLASSES_JAR
or LOCAL_SOONG_HEADER_JAR. So don't add them to javalib.jar's
dependencies.

Bug: 144664536
Change-Id: I6b530d40c859c6484425b8ec37c0fa7112a21346
2021-03-18 08:49:02 +08:00
Treehugger Robot
074887bd18 Merge "verity_utils.py is a standalone binary" am: 2245dee0d7
Original change: https://android-review.googlesource.com/c/platform/build/+/1636002

Change-Id: I04849e9315bf90f0cf6f49764968f87bf2c23f54
2021-03-18 00:04:06 +00:00
Treehugger Robot
2245dee0d7 Merge "verity_utils.py is a standalone binary" 2021-03-17 23:37:04 +00:00
Yifan Hong
79ba5ef7ca Merge "Add PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS to check_vintf_compatible_log" am: 2b4d131e15
Original change: https://android-review.googlesource.com/c/platform/build/+/1627260

Change-Id: I1b49787d24863a43633b575a054bdf53bb4479bc
2021-03-17 19:33:41 +00:00
Yifan Hong
2b4d131e15 Merge "Add PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS to check_vintf_compatible_log" 2021-03-17 18:30:48 +00:00
Artur Satayev
398b995d74 Move allowed_deps.txt to packages/modules/common.
Bug: 179234385
Test: run update-apex-allowed-deps.sh locally
Change-Id: I6866e7a80bce03f991f5b99fb5182c91351cc311
Merged-In: I6866e7a80bce03f991f5b99fb5182c91351cc311
2021-03-17 15:49:01 +00:00
Janis Danisevskis
88a0602582 Keystore 2.0: Enable keystore2 by default
Bug: 170144267
Test: N/A
Merged-In: Id9f39dc5189b7eda4617328c41a4ac4d4e3af578
Change-Id: Id9f39dc5189b7eda4617328c41a4ac4d4e3af578
2021-03-17 08:47:55 -07:00
Inseob Kim
a3ae471485 Add sepolicy related variables
Bug: 33691272
Test: build
Change-Id: Ifbcd2c49d6ecf6d7e69d6b95bace168eccd17f13
2021-03-17 18:04:56 +09:00
Jiyong Park
b92b8f48fc verity_utils.py is a standalone binary
verity_utils.py gets an entry point and becomes a host binary. This is
to support signing images from the "bootimg" module type. Previously
this was done by directly invoking "avbtool" from the soong module, but
that required people to know the partition_size priori. The partition
size may not be known before actually building the partition image
especially when the partition is not for a physical partition but for a
partition in a composite image.

verity_utils.py, when the partition_size is not given, is capable of
calculating the mininum required partition size based on the size of the
unsigned input image file.

Bug: 180676957
Test: m microdroid_boot-5.10
Change-Id: I7bef292fb141c90899b7bdc0748895f95f964829
2021-03-17 16:28:16 +09:00
Justin Yun
f39f080c80 Define ro.board.first_api_level property
When a device define BOARD_SHIPPING_API_LEVEL with an API level, it
sets a vendor property ro.board.first_api_level in vendor/build.prop.
This is for the GRF devices. Non-GRF devices must not define this
property.

Bug: 176950752
Test: getprop ro.board.first_api_level
Change-Id: I6921d7fe6acca3f73a5fd0fbaa3d4f1e9394541b
2021-03-17 15:00:23 +09:00
Tianjie
8ba4270e24 Check that sum of DAP groups is smaller than super
The maximum size of all dynamic partition groups should not exceed
the super size - DAP metadata size. Today the configuration of
some devices don't take the metadata into acount. So turn the CheckLe
into CheckLt.

Also, display a warning if the reserved size for DAP metadata is less
than 1M.

Bug: 182431975
Test: mm -j32 check-all-partition-sizes
Change-Id: Ie278f224321083e457d68da000c2b22ec8a54085
2021-03-16 22:13:13 -07:00
android-build-team Robot
3de8fdaece Version bump to RQ2A.210405.006 [core/build_id.mk]
Change-Id: I43ab54e5794231f0bbdc1406fbe655dedb6af341
2021-03-17 03:55:53 +00:00
Treehugger Robot
51f44d8db6 Merge "Add "ktgrep" for Kotlin" am: 69973f0aa1
Original change: https://android-review.googlesource.com/c/platform/build/+/1477957

Change-Id: Ibbb86d57c9d286137ad0e68461f1335b1cc618d3
2021-03-16 19:56:05 +00:00
Treehugger Robot
69973f0aa1 Merge "Add "ktgrep" for Kotlin" 2021-03-16 19:26:42 +00:00
Colin Cross
04e4646dc9 Merge "Do not pack symbolic link instead copying" am: 67f1a24b87
Original change: https://android-review.googlesource.com/c/platform/build/+/1626199

Change-Id: I5729db6e1c27f2825d940cb5998fc12e4b9d9d62
2021-03-16 18:57:31 +00:00
Colin Cross
67f1a24b87 Merge "Do not pack symbolic link instead copying" 2021-03-16 18:14:45 +00:00
Justin DeMartino
6f7c112592 Merge "Allow extending of the list of directories to be scanned for VSDK" am: 0f05976472
Original change: https://android-review.googlesource.com/c/platform/build/+/1603218

Change-Id: Ic91c308f8f4587a3fa0e61ae7f16c339cce8bd7b
2021-03-16 15:44:23 +00:00
Justin DeMartino
0f05976472 Merge "Allow extending of the list of directories to be scanned for VSDK" 2021-03-16 15:12:17 +00:00
Ulyana Trafimovich
9135ac961c Merge "Reimplement verify_uses_libraries.sh in manifest_check.py." am: d3109e2514
Original change: https://android-review.googlesource.com/c/platform/build/+/1614845

Change-Id: I8a093a94f89f3b2e8ffbadabda29d12db1da0920
2021-03-16 14:10:10 +00:00
Ulyana Trafimovich
d3109e2514 Merge "Reimplement verify_uses_libraries.sh in manifest_check.py." 2021-03-16 13:37:03 +00:00
Taesu Lee
ea0cecd9e4 Add "ktgrep" for Kotlin
New ktgrep is added and sgrep/treegrep also scan *.kt files.

Test: kgrep/sgrep/treegrep for Kotlin files.

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: Ie615aa86c4958310785392f18ee7bddaf64706a9
2021-03-16 15:10:34 +09:00
Mitch Phillips
bb62a4f304 Merge "Add MTE ELF note to makefile-generated native tests." am: 82a4cfb397
Original change: https://android-review.googlesource.com/c/platform/build/+/1615164

Change-Id: I1de637bd6081be9ddd516d579afb56088f4c1088
2021-03-15 22:16:09 +00:00
Mitch Phillips
82a4cfb397 Merge "Add MTE ELF note to makefile-generated native tests." 2021-03-15 21:33:07 +00:00
Mitch Phillips
1a8405f827 Add MTE ELF note to makefile-generated native tests.
The MTE ELF note is intended to be added to all aarch64 test binaries.
This is already implemented for cc_test in soong, but we should also add
it to makefile-generated tests.

Bug: 156029370
Bug: 181133973

Test: atest CtsBionicTestCases on QEMU+MTE, observe previously-failing
      tests will now succeed.
Test: m camera_client_test; readelf -t <snip>/camera_client_test | grep
      memtag, make sure there's the elf note.

Change-Id: I2e7c4d1379ccdef04f05dd7aff675e6834d4799b
2021-03-15 10:45:05 -07:00
Ulya Trafimovich
a2404510af Reimplement verify_uses_libraries.sh in manifest_check.py.
Previously there were two different scripts that did similar things:
1) build/soong/scripts/manifest_check.py
2) build/make/core/verify_uses_libraries.sh

Both scripts extracted <uses-library> tags and `targetSdkVersion` from
the manifests of Java modules, but 1) worked for XML manifests, and 2)
worked for APKs. This CL reimplements the functionality from 2) in 1),
so that one script can handle both XML manifests and APKs.

Bug: 132357300

Test: lunch cf_x86_64_phone-userdebug && m && launch_cvd \
      adb wait-for-device && adb root && adb logcat \
      | grep -E 'ClassLoaderContext [a-z ]+ mismatch'
      # empty grep output, no errors

Change-Id: I386aa1a37699182cdf6f3f94ef8aa7b96a4017d3
2021-03-15 13:50:57 +00:00
Justin Yun
69f7191d5d Define __ANDROID_VENDOR__ and __ANDROID_PRODUCT__
__ANDROID_VNDK__ is defined for the modules that are able to use the
VNDK libraries. As both product and vendor variants define
__ANDROID_VNDK__, we don't know if a module is built for vendor or
product on build time.

__ANDROID_VENDOR__ and __ANDROID_PRODUCT__ macros can be used to
specify the image-variant-dependent codes.

Bug: 180646847
Test: m nothing
Change-Id: I9a37607b1e1e4e16eab02fb6c96d1a92158c96b8
2021-03-15 18:17:35 +09:00
goodway.wang_cp
50acc66276 Do not pack symbolic link instead copying
Change-Id: I43f56276541addfd6063655e53f21fe483780bc1
Signed-off-by: goodway.wang_cp <sz755cp2369@gmail.com>
2021-03-15 17:13:50 +08:00
Treehugger Robot
abdde757dd Merge "Enable madvising of odex, vdex and art files" am: 4d71d70496
Original change: https://android-review.googlesource.com/c/platform/build/+/1634679

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35d4bcea3cc03e6e875ce18d7dfc5060afb3d4bc
2021-03-13 02:59:21 +00:00
Treehugger Robot
4d71d70496 Merge "Enable madvising of odex, vdex and art files" 2021-03-13 02:13:52 +00:00
Devin Moore
cc2abae62e Merge "Add bootconfig to kernel cmdline when BOARD_BOOTCONFIG not empty" am: a74a5a19bf
Original change: https://android-review.googlesource.com/c/platform/build/+/1627053

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0ab7ce322cc34d95c88172c27c0a692e378b858
2021-03-12 23:22:05 +00:00
Devin Moore
a74a5a19bf Merge "Add bootconfig to kernel cmdline when BOARD_BOOTCONFIG not empty" 2021-03-12 22:57:58 +00:00
Jagadeesh Pakaravoor
bee9f1d3f7 Enable madvising of odex, vdex and art files
Enable madvsing odex, vdex and art files to MADV_WILLNEED by setting the
size limits to UINT32_MAX.

Test: presubmit
Bug: 178853586
Change-Id: I7647a4be214dcd43341f216aba0a7791f877e379
2021-03-12 13:20:09 -08:00
Justin DeMartino
f15053ee39 Allow extending of the list of directories to be scanned for VSDK
Bug: 180925851
Test: m nothing, manually
Change-Id: I499f084f04e45eb719882be97e3a581ff868cc98
2021-03-12 19:38:14 +00:00
Treehugger Robot
a3cfaead7b Merge "Trigger data wipe on spl-downgrade as well" am: b7ade64e3f
Original change: https://android-review.googlesource.com/c/platform/build/+/1621979

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I612777fbc021f6009ab11c3171ab871c40c264ad
2021-03-12 19:28:47 +00:00
Treehugger Robot
b7ade64e3f Merge "Trigger data wipe on spl-downgrade as well" 2021-03-12 18:50:38 +00:00
Cindy Zhou
086efc219a Merge "Enable cfi for 32bit arch" am: e48dccaa83
Original change: https://android-review.googlesource.com/c/platform/build/+/1627124

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a1946ee284e7a4a7015de3a0cbf011effdc0e3f
2021-03-12 13:04:52 +00:00
Cindy Zhou
e48dccaa83 Merge "Enable cfi for 32bit arch" 2021-03-12 12:41:39 +00:00
Treehugger Robot
13478972cf Merge "check_all_partition_sizes_log -> .log" am: c2643ead16
Original change: https://android-review.googlesource.com/c/platform/build/+/1629123

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60c7b1df58667720ad9b7b8ac17115567fe13516
2021-03-12 07:29:32 +00:00
Treehugger Robot
c2643ead16 Merge "check_all_partition_sizes_log -> .log" 2021-03-12 06:57:08 +00:00
David Anderson
ae5c50d274 Merge "Add --disable_vabc to ota_from_target_files help text." am: 0260435d70
Original change: https://android-review.googlesource.com/c/platform/build/+/1630019

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iab35c3f1eb8bb9d8c064aae98a9489da00ad6d2a
2021-03-12 03:55:45 +00:00
David Anderson
0260435d70 Merge "Add --disable_vabc to ota_from_target_files help text." 2021-03-12 02:51:22 +00:00
Yifan Hong
d11953c3b7 check_all_partition_sizes_log -> .log
So that it can be viewed directly in the web browser.
Test: pass

Change-Id: Ic90a5d1511153a74726f1bdee5d9a058756f2d19
2021-03-11 14:47:59 -08:00
David Anderson
45b4230726 Add --disable_vabc to ota_from_target_files help text.
Bug: N/A
Test: N/A
Change-Id: Ib8f9cd5dae746b0f2dac15d4de378116f4b93178
2021-03-11 13:01:31 -08:00
Petri Gynther
faa461aaee Merge changes I899810c7,If73b15d7 am: 3296b3136e
Original change: https://android-review.googlesource.com/c/platform/build/+/1627461

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d32cf4623a039eb7bbd6f537c89d500553d581b
2021-03-11 20:30:10 +00:00
Petri Gynther
c77e1025bf Merge changes Ibac6424f,Ief572e30 am: 345294f459
Original change: https://android-review.googlesource.com/c/platform/build/+/1626721

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9a924bc13b58b513b02b2054a24b76dba87a35c
2021-03-11 20:29:46 +00:00
Petri Gynther
3296b3136e Merge changes I899810c7,If73b15d7
* changes:
  Add vendor_dlkm, odm, odm_dlkm to dynamic partition filter
  Fix typo: DLKIMMAGE
2021-03-11 20:00:25 +00:00
Petri Gynther
345294f459 Merge changes Ibac6424f,Ief572e30
* changes:
  Copy vendor_ramdisk[-debug].img to out/dist
  Add support for building vendor_ramdisk-debug.img
2021-03-11 19:55:02 +00:00
Treehugger Robot
de36af49d7 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/make" am: e4adbd3306
Original change: https://android-review.googlesource.com/c/platform/build/+/1627682

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12d4bfa6486e26a9b8f59f4fde9bf5aa723bcdb1
2021-03-11 10:24:33 +00:00
Treehugger Robot
e4adbd3306 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/make" 2021-03-11 09:51:40 +00:00