Commit graph

67547 commits

Author SHA1 Message Date
Bob Badour
f7e9c43464 Merge "Fix bug: include all dirs not just the last one." 2021-04-14 00:16:12 +00:00
Daniel Norman
4b7ee39a70 Merge changes Ic269fa99,I045be7cb
* changes:
  Generate care_map.pb when merging target files packages.
  Moves care map generation logic to common.py, so it can be reused.
2021-04-13 23:54:08 +00:00
Treehugger Robot
e58067f70d Merge "Remove grf_required_api_level" 2021-04-13 23:29:31 +00:00
Mateusz Zięba
5371607b50 Fix bug: include all dirs not just the last one.
Test: m all

Change-Id: I5724f792ee36c2f66786761e5d55b4f6c456753c
2021-04-13 13:14:13 -07:00
Daniel Norman
db8cacc976 Generate care_map.pb when merging target files packages.
Test: build a merged target using Forrest,
      Observe META/care_map.pb
Bug: 182296208
Change-Id: Ic269fa99ec8ed2bd474a2f69b1be1f545c567112
2021-04-13 11:43:02 -07:00
Kelvin Zhang
2732413fa2 Moves care map generation logic to common.py, so it can be reused.
Test: th
Bug: 182296208
Change-Id: I045be7cb208412431d6ab1c26e31d38d2285738b
2021-04-13 11:42:26 -07:00
Mitch Phillips
002dd30e94 Merge "[MTE] [CFI] Fix CFI -> diag promotion with memtag_heap." 2021-04-13 15:31:14 +00:00
Ulyana Trafimovich
27db0284d0 Merge "Don't expect all Java modules to have a manifest." 2021-04-13 15:16:37 +00:00
Ulya Trafimovich
6ef5779c98 Don't expect all Java modules to have a manifest.
Some libraries that go through manifest_check do not have a manifest or
APK, so there is nothing to check LOCAL_USES_LIBRARIES and
LOCAL_OPTIONAL_USES_LIBRARIES against. Handle it as if the manifest had
zero <uses-library> tags: don't fail the build unless the module has
non-empty LOCAL_USES_LIBRARIES or LOCAL_OPTIONAL_USES_LIBRARIES.

Bug: 132357300
Test: lunch cf_x86_64_phone-userdebug && m
Change-Id: I4b1317cfbd93cb6129caba51b56081307a564442
2021-04-13 12:42:44 +01:00
Yo Chiang
7a8965c1fb Merge "Support installing modules.options file" 2021-04-13 09:20:24 +00:00
Justin Yun
48aa78ed3c Remove grf_required_api_level
As we don't fix the grf window, we may not calculate the grf
expiration date and the required api level.
The verification of this will be covered by the tests at run time.

Bug: 176950752
Test: atest --host post_process_props_unittest
Change-Id: I1205f0d9a9da5bc508a49acbcbb7da581800bf45
2021-04-13 17:58:59 +09:00
Yo Chiang
dd74264737 Merge "Revert^2 "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk""" 2021-04-13 07:22:25 +00:00
Mitch Phillips
77e037c887 [MTE] [CFI] Fix CFI -> diag promotion with memtag_heap.
Small typo in the AndroidMk sanitizer config, where adding heap MTE
ended up promoting CFI to diagnostic CFI accidentally, where this isn't
a valid transformation.

Bug: 184397138
Test: lunch aosp_sunfish-userdebug
Test: PRODUCT_MEMTAG_HEAP_ASYNC_INCLUDE_PATHS=\
Test: "hardware/qcom frameworks/opt/net/wifi" \
Test: CFI_INCLUDE_PATHS=hardware/qcom \
Test: m libwifi-hal
Change-Id: I74a03debf0042f2ee004503dd4a0e81131bd9fde
2021-04-12 15:35:47 -07:00
Peter Collingbourne
ffa65ba8f0 Merge "Only link the MTE notes against executables." 2021-04-12 21:26:05 +00:00
Liz Kammer
5f2d88bee8 Merge "Add LOCAL_FULL_INIT_RC to handle init_rc full path" 2021-04-12 19:05:27 +00:00
Peter Collingbourne
8b80f3e4d5 Only link the MTE notes against executables.
Soong has equivalent logic but it was missing on the .mk side.

Bug: 135772972
Change-Id: I5fc5a387313f6ae43c6510ee63d153aa81fb58b1
2021-04-12 12:04:29 -07:00
Yo Chiang
71c7048593 Merge "Strip whitespace from INTERNAL_VENDOR_RAMDISK_FRAGMENTS" 2021-04-12 03:33:37 +00:00
Hans Boehm
4f6f55d4e7 Merge "Revert "Enable apex compression on all devices with updatable apex"" 2021-04-10 05:42:10 +00:00
Hans Boehm
f8283a8bf6 Revert "Enable apex compression on all devices with updatable apex"
This reverts commit eaa853ad3c.

Reason for revert: breaks git_rvc-qpr-dev-plus-aosp build.

Bug: 184989544

Change-Id: Id760adaf99babe53e7cf096180032a9683587006
2021-04-10 01:06:39 +00:00
Nikita Ioffe
359f09fd01 Merge "Enable apex compression on all devices with updatable apex" 2021-04-09 21:39:11 +00:00
Nikita Ioffe
eaa853ad3c Enable apex compression on all devices with updatable apex
Test: atest ApexTestCases
Test: atest CtsStagedInstallHostTestCases
Test: coral boots
Test: checked OTA works
Change-Id: I12938b93731e0bb82b49d5d1f3815e899dafa0bf
2021-04-09 21:38:55 +00:00
Yi-Yo Chiang
378b77929f Strip whitespace from INTERNAL_VENDOR_RAMDISK_FRAGMENTS
aosp/1664081 introduces a bug where if BOARD_VENDOR_RAMDISK_FRAGMENTS is
empty, then INTERNAL_VENDOR_RAMDISK_FRAGMENTS would become " " (single
whitespace).
Just unconditionally $(strip ...) the variable to remove any extra
whitespace.

Bug: 183395459
Test: m dist and check *-target_files-*.zip
Change-Id: Ic842756f3a64c073593592d22c980820664e11c1
2021-04-09 12:32:41 +00:00
Treehugger Robot
b2fccdd318 Merge "Fix build break for Android.bp dex_import" 2021-04-09 06:00:27 +00:00
Treehugger Robot
fb65e89346 Merge "Add a build flag to turn on debugfs restrictions" 2021-04-09 00:12:02 +00:00
Treehugger Robot
e2002fb905 Merge "Unify the style of _MakeRamdisk for ramdisk format" 2021-04-08 22:44:45 +00:00
Treehugger Robot
f0ed29862f Merge "Remove all unused, legacy FDO build rules" 2021-04-08 18:31:40 +00:00
Treehugger Robot
13ebf1bdf5 Merge "Remove legacy host shared library linking with gcov" 2021-04-08 18:31:08 +00:00
Colin Cross
df682c6fe1 Merge "Package jacoco and proguard files out of a PACKAGING directory" 2021-04-08 17:17:53 +00:00
Liz Kammer
382be36c43 Add LOCAL_FULL_INIT_RC to handle init_rc full path
Soong supports references to other modules for init_rc property, so full
paths need to be passed from Soong to make rather than module local
paths.

Test: m droid dist
Bug: 184567830
Change-Id: Ib1873a3418830f5cbf32e26f55d3ad0ab0d9c9c5
2021-04-08 11:33:46 -04:00
jiajia tang
836f76bc3a Unify the style of _MakeRamdisk for ramdisk format
RamdiskFormat class is introduced by commit : f3f842b676
But it seems _MakeRamdisk() related codes are also needed, then
both of the code style are same.

This patch takes below 2 changes:
1) adds new commom function _GetRamdiskFormat()
2) unfiy the code logic of _MakeRamdisk() and its related code logic.

Change-Id: Ibd4932a6050fbac15fcd741c70dd7854c12e887d
Signed-off-by: jiajia tang <tangjiajia@xiaomi.com>
2021-04-08 09:55:15 +00:00
SzuWei Lin
d58ae982cf Merge "Export prebuilt-info.txt of perbuilts kernel to dist" 2021-04-08 09:24:05 +00:00
Colin Cross
330b1fef31 Package jacoco and proguard files out of a PACKAGING directory
Package jacoco-report-classes.jar, proguard_usage.zip and
proguard_dictionary out of directories in $OUT/obj/PACKAGING
so that they get cleared by m installclean.  This will make
incremental builds that package these files accurate as long
as installclean was run, which is much faster than a full clean
build.

Bug: 184583915
Test: m TARGET_BUILD_APPS=DeskClock EMMA_INSTRUMENT=true dist
Change-Id: I60c6a0fec1fbce26eab8d5adab25a2231b48e251
2021-04-07 18:52:02 -07:00
Treehugger Robot
222b4ab071 Merge "Use BOARD_API_LEVEL to define ro.board.api_level" 2021-04-08 00:15:06 +00:00
Hridya Valsaraju
b39ec7084a Add a build flag to turn on debugfs restrictions
Starting with Android R launched devices, debugfs cannot be mounted in
production builds. In order to avoid accidental debugfs dependencies
from creeping in during development with userdebug/eng builds, this
patch introduces a build flag that can be set by vendors to enforce
additional debugfs restrictions for userdebug/eng builds. The same flag
will be used to enable sepolicy neverallow statements to prevent new
permissions added for debugfs access.

Bug: 184381659
Test: make with/without PRODUCT_SET_DEBUGFS_RESTRICTIONS
Change-Id: I9aff974da7ddce9bf1a7ec54153b161527b12062
2021-04-07 16:47:59 -07:00
Janis Danisevskis
bacb3ebb2a Merge "Keystore 2.0: Remove keystore and keystore2.enable property." 2021-04-07 19:30:12 +00:00
Rupert Shuttleworth
90eeff54ea Merge "Mark prop file as writable before writing to it." 2021-04-07 12:40:34 +00:00
Yo Chiang
7716d479cc Merge "gsi_skip_mount.cfg skips system sub-mountpoints" 2021-04-07 05:04:21 +00:00
David Anderson
5ebe28c1d4 Merge "Relax inode usage estimate." 2021-04-07 02:15:39 +00:00
Treehugger Robot
d641585484 Merge "Builds boot-test-harness.img, if INSTALLED_BOOTIMAGE_TARGET." 2021-04-07 02:05:36 +00:00
Rupert Shuttleworth
3993af706c Mark prop file as writable before writing to it.
Test: Fixes USE_BAZEL=1 m builds.
Change-Id: I1e0fb448049ff21cd32541af56e856442bc25fa7
2021-04-07 01:22:00 +00:00
Ryan Prichard
5727dc3dd1 Merge "Stop linking against libatomic" 2021-04-06 21:43:33 +00:00
Christian Wailes
8c614d2515 Merge "Add the service-art JAR to the System Server classpath." 2021-04-06 20:30:18 +00:00
Treehugger Robot
2fea84f592 Merge "zipalign: clarify the help for -p slightly." 2021-04-06 19:15:43 +00:00
Paul Duffin
9910b5e43a Merge "Remove use of REMOVE_ATB_FROM_BCP" 2021-04-06 14:09:30 +00:00
Paul Duffin
24f62069d0 Remove use of REMOVE_ATB_FROM_BCP
This change cleans up after the work to remove the android.test.base
classes from the bootclasspath. That work allowed the presence of
android.test.base in the bootclasspath to be configured at build time
to allow the changes to be tested without affecting the standard
Android builds and avoiding having to repeatedly reapply/revert the
changes that excluded android.test.base from the bootclasspath. That
change has been applied and stuck and no builds change the default by
setting REMOVE_ATB_FROM_BCP=false so we no longer need to support that
capability.

This change removes the build time switch to add
framework-atb-backward-compatibility to the bootclasspath and another
change in the same topic merges those classes into the
framework-minus-apex module. So, while a module has been removed from
the bootclasspath the classes available on it have not changed.

Bug: 184331423
Test: m nothing
Change-Id: I9dadaf8b0c2684bf1983b353bb2acf4f42655e1a
2021-04-06 11:53:08 +01:00
Yo Chiang
bebc8a35ef Merge "Refactor vendor_boot v4 build logic and add more checks" 2021-04-06 09:02:14 +00:00
Bowgo Tsai
1ed0fd54dc Builds boot-test-harness.img, if INSTALLED_BOOTIMAGE_TARGET.
Similar to commit Ic887ea93d4c5181eca0f82c3cdf3ce3b72f4c185
for boot-debug.img, we should also only build boot-test-harness.img
if boot.img exists.

Bug: 184365242
Test: tree hugger

Change-Id: Ie0d9e460905d488e418cf4ee1bd44e6e7c58470d
2021-04-06 08:20:15 +00:00
Justin Yun
07ceaa71c1 Use BOARD_API_LEVEL to define ro.board.api_level
GRF devices must define the API level of which the SoC is first
shipped by setting BOARD_SHIPPING_API_LEVEL. As this is a permanent
value, vendors may not change this value even if they implement new
features under the GRF policy.

BOARD_API_LEVEL can be optionally defined in this case to manually
set the api level of the vendor implementation.
The current api level will be set to `ro.board.api_level` property.

Bug: 176950752
Test: atest --host post_process_props_unittest
Change-Id: Ib126c1a622ded9848650f3f60c0f15005867272d
2021-04-06 16:33:07 +09:00
Yo Chiang
b5bff9a4d3 Merge "Fix Makefile formatting" 2021-04-06 07:27:44 +00:00
Treehugger Robot
3c610dd0aa Merge "Fix builds with enforce_vintf_kernel + !kernel" 2021-04-06 02:51:38 +00:00