Commit Graph

27372 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
Ulyana Trafimovich
c9227c8b63 Revert^2 "Reimplement verify_uses_libraries.sh in manifest_check.py."
Reason for revert: relanding original change. The fix was to add AAPT to
the dependencies of the failed command. It didn't fail in AOSP, and on
some targets in sc-dev, because the build order happened to be different
and AAPT was built by the time it was needed. This also explains why
some builds oscillated between red and green.

Reverted Changes:
I52f00c9f4:Revert "Don't depend on nonexistent manifest when ...
I4c2d4e1c7:Revert "Reimplement verify_uses_libraries.sh in ma...
Ibebd616a7:Revert "Reimplement verify_uses_libraries.sh in ma...

Bug: 132357300
Bug: 183010666
Change-Id: I8c78e48345bee5b77de41af03bdac77c402d04a1
Test: treehugger
Test: forrest on git_sc-dev target aosp_blueline-userdebug
2021-03-18 11:42:11 +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
Ulyana Trafimovich
c66c841e88 Merge "Revert "Reimplement verify_uses_libraries.sh in manifest_check.py."" into sc-dev 2021-03-17 23:32:54 +00:00
Yifan Hong
cedb3c461b Merge "Add PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS to check_vintf_compatible_log" am: 2b4d131e15 am: 79ba5ef7ca am: c0ecc1e76b
Original change: https://android-review.googlesource.com/c/platform/build/+/1627260

Change-Id: Ia907de68e69a66dcba9926971e6537b8e3f55906
2021-03-17 21:32:46 +00:00
Ulyana Trafimovich
012bc120af Revert "Reimplement verify_uses_libraries.sh in manifest_check.py."
Revert "Reimplement verify_uses_libraries.sh in manifest_check.py."

Revert submission 1614807-uses-libs-47

Reason for revert: broken build 7215516 on git_sc-dev \
  on aosp_blueline-userdebug

Reverted Changes:
Id1b66e4f3:Reimplement verify_uses_libraries.sh in manifest_c...
I386aa1a37:Reimplement verify_uses_libraries.sh in manifest_c...

Bug: 183010666
Change-Id: Ibebd616a7bc6672e252182feb301eb1c3e975045
Test: treehugger
2021-03-17 21:07:30 +00:00
TreeHugger Robot
9591b1b063 Merge "Move allowed_deps.txt to packages/modules/common." into rvc-qpr-dev-plus-aosp 2021-03-17 21:02:34 +00:00
Yifan Hong
c0ecc1e76b Merge "Add PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS to check_vintf_compatible_log" am: 2b4d131e15 am: 79ba5ef7ca
Original change: https://android-review.googlesource.com/c/platform/build/+/1627260

Change-Id: I30a1c9c7f571f3fe2c6200f07d7a95b6892656c4
2021-03-17 20:49:55 +00:00
Paul Scovanner
321db2f846 DO NOT MERGE
Update Security String to 2021-05-05

Bug: 182937985
Change-Id: Ica626a3b19e5b642807234c288428cd7e0f40f98
2021-03-17 20:26:59 +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
Justin DeMartino
a094fe6b54 Merge "Allow extending of the list of directories to be scanned for VSDK" am: 0f05976472 am: 6f7c112592 am: 32e4b6fcb6
Original change: https://android-review.googlesource.com/c/platform/build/+/1603218

Change-Id: I43bf2812a5a705e13069d49d98f447024e7dc37a
2021-03-17 16:18:07 +00:00
Ulyana Trafimovich
ef392cec07 Merge "Reimplement verify_uses_libraries.sh in manifest_check.py." am: d3109e2514 am: 9135ac961c am: e1a456bb84
Original change: https://android-review.googlesource.com/c/platform/build/+/1614845

Change-Id: I4dabfe00f659b3919860ac6a413e045962bad0cc
2021-03-17 16:17:29 +00:00
Mitch Phillips
bcca410180 Merge "Add MTE ELF note to makefile-generated native tests." am: 82a4cfb397 am: bb62a4f304 am: 587e625e20
Original change: https://android-review.googlesource.com/c/platform/build/+/1615164

Change-Id: I72d67852e5e446888405741b879518b2bceb7075
2021-03-17 16:01:06 +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
Artur Satayev
1cd28cdd03 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:35:48 +00:00
Artur Satayev
a2a5671ca5 Move allowed_deps.txt to packages/modules/common.
Bug: 179234385
Test: run update-apex-allowed-deps.sh locally
Change-Id: I6866e7a80bce03f991f5b99fb5182c91351cc311
Merged-In: I6866e7a80bce03f991f5b99fb5182c91351cc311
(cherry picked from commit 921646a8ff)
(cherry picked from commit 046e713abd)
2021-03-17 11:31:31 +00:00
Inseob Kim
a3ae471485 Add sepolicy related variables
Bug: 33691272
Test: build
Change-Id: Ifbcd2c49d6ecf6d7e69d6b95bace168eccd17f13
2021-03-17 18:04:56 +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
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
Justin DeMartino
32e4b6fcb6 Merge "Allow extending of the list of directories to be scanned for VSDK" am: 0f05976472 am: 6f7c112592
Original change: https://android-review.googlesource.com/c/platform/build/+/1603218

Change-Id: Ia9697de5cf866349295acb3b42b38ae454c32f39
2021-03-16 16:20:02 +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
e1a456bb84 Merge "Reimplement verify_uses_libraries.sh in manifest_check.py." am: d3109e2514 am: 9135ac961c
Original change: https://android-review.googlesource.com/c/platform/build/+/1614845

Change-Id: Ibb8a6f88664d43da8ad543be40cacd6757942450
2021-03-16 14:45:33 +00:00
Artur Satayev
046e713abd Move allowed_deps.txt to packages/modules/common.
Bug: 179234385
Test: run update-apex-allowed-deps.sh locally
Change-Id: I6866e7a80bce03f991f5b99fb5182c91351cc311
Merged-In: I6866e7a80bce03f991f5b99fb5182c91351cc311
(cherry picked from commit 921646a8ff)
2021-03-16 14:31:33 +00:00
Ulyana Trafimovich
d3109e2514 Merge "Reimplement verify_uses_libraries.sh in manifest_check.py." 2021-03-16 13:37:03 +00:00
Mitch Phillips
587e625e20 Merge "Add MTE ELF note to makefile-generated native tests." am: 82a4cfb397 am: bb62a4f304
Original change: https://android-review.googlesource.com/c/platform/build/+/1615164

Change-Id: I845e65a88a9ffe1b9e50e209090832cb16707ad1
2021-03-15 22:57:51 +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
Devin Moore
2dfd4abaec Merge "Add bootconfig to kernel cmdline when BOARD_BOOTCONFIG not empty" am: a74a5a19bf am: cc2abae62e am: d724a01f5a
Original change: https://android-review.googlesource.com/c/platform/build/+/1627053

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6fa4fbae2b52d6bdc0f0eea8137afb5e837bbfe4
2021-03-13 00:29:54 +00:00
Devin Moore
d724a01f5a Merge "Add bootconfig to kernel cmdline when BOARD_BOOTCONFIG not empty" am: a74a5a19bf am: cc2abae62e
Original change: https://android-review.googlesource.com/c/platform/build/+/1627053

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id99cb87c703d32edb0df7b350e304171e0f75dd2
2021-03-12 23:43: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
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
Cindy Zhou
ee6c6ddc5b Merge "Enable cfi for 32bit arch" am: e48dccaa83 am: 086efc219a am: aa5c8dce50
Original change: https://android-review.googlesource.com/c/platform/build/+/1627124

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23aea7d905570bdf5f991bc3569c11a61f266648
2021-03-12 13:47:22 +00:00
Cindy Zhou
aa5c8dce50 Merge "Enable cfi for 32bit arch" am: e48dccaa83 am: 086efc219a
Original change: https://android-review.googlesource.com/c/platform/build/+/1627124

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58e18626107c61effd82c656a1bf24fcc5b33c41
2021-03-12 08:47:41 +00:00
Treehugger Robot
70bee74f1b Merge "check_all_partition_sizes_log -> .log" am: c2643ead16 am: 13478972cf
Original change: https://android-review.googlesource.com/c/platform/build/+/1629123

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I62ff3799186fcf7151caa89591762f3fe682baba
2021-03-12 08:07:26 +00:00
Treehugger Robot
c2643ead16 Merge "check_all_partition_sizes_log -> .log" 2021-03-12 06:57:08 +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
Petri Gynther
2a2d2c4838 Merge changes I899810c7,If73b15d7 am: 3296b3136e am: faa461aaee am: ca5d83fab6
Original change: https://android-review.googlesource.com/c/platform/build/+/1627461

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46dabaa7c7f60ae70486a04caa4a519124e10179
2021-03-11 21:44:20 +00:00
Petri Gynther
295486c079 Merge changes Ibac6424f,Ief572e30 am: 345294f459 am: c77e1025bf am: 06175093dd
Original change: https://android-review.googlesource.com/c/platform/build/+/1626721

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I480bc2cf0dce12f52738a933f1b54fa2af9d5040
2021-03-11 21:43:30 +00:00
Petri Gynther
ca5d83fab6 Merge changes I899810c7,If73b15d7 am: 3296b3136e am: faa461aaee
Original change: https://android-review.googlesource.com/c/platform/build/+/1627461

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12675be173897f6905a6b7839bd71aadbc6f924f
2021-03-11 21:04:29 +00:00
Petri Gynther
06175093dd Merge changes Ibac6424f,Ief572e30 am: 345294f459 am: c77e1025bf
Original change: https://android-review.googlesource.com/c/platform/build/+/1626721

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3140181b598c215c3cc82ab1eb6803e18c8208fe
2021-03-11 21:04:22 +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
729b3f13f3 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/make" am: e4adbd3306 am: de36af49d7 am: cc44f061cc
Original change: https://android-review.googlesource.com/c/platform/build/+/1627682

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38f06dc1c725fb244d911bf83091e01d3899b947
2021-03-11 12:01:21 +00:00
Treehugger Robot
cc44f061cc Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/make" am: e4adbd3306 am: de36af49d7
Original change: https://android-review.googlesource.com/c/platform/build/+/1627682

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8c9e771f61b7ad39cb05cb7173f40bbc059b3b2
2021-03-11 11:00:39 +00:00
Bob Badour
a8cf0e040e [LSC] Add LOCAL_LICENSE_KINDS to build/make
Added SPDX-license-identifier-Apache-2.0 to:
  core/tasks/tools/package-modules.mk

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m nothing

Exempt-From-Owner-Approval: janitorial work
Change-Id: I751a3d65c9791c5397e1bcdb89342c0b61647411
2021-03-10 23:31:03 -08:00
Petri Gynther
09865a4911 Add vendor_dlkm, odm, odm_dlkm to dynamic partition filter
When building images in -without-vendor clients, we need to filter out:
vendor, vendor_dlkm, odm, odm_dlkm

from the dynamic partitions list for the OTA image build to succeed.

Bug: 173653839
Bug: 182319837
Test: add vendor_dlkm, odm, odm_dlkm to dynamic partitions + make dist
Change-Id: I899810c7f46e40730280d89b94047779705b6e2f
2021-03-10 21:34:07 -08:00