Commit Graph

67777 Commits

Author SHA1 Message Date
Nicolas Geoffray
d0b090354a Merge "Preopt apps with updatable boot classpath too." am: 01545ef795
Original change: https://android-review.googlesource.com/c/platform/build/+/1654960

Change-Id: I44cec1de6806af9451e4b60a9702a27e2830fada
2021-03-30 14:23:25 +00:00
Nicolas Geoffray
01545ef795 Merge "Preopt apps with updatable boot classpath too." 2021-03-30 13:40:57 +00:00
Yo Chiang
2028ab10b7 Merge "Remove obsolete var PRODUCT_CHECK_ELF_FILES" am: 08b0004c9c
Original change: https://android-review.googlesource.com/c/platform/build/+/1655468

Change-Id: I94a8103d4e45d6325cce3210b560f35a7e939927
2021-03-30 09:19:37 +00:00
Yo Chiang
08b0004c9c Merge "Remove obsolete var PRODUCT_CHECK_ELF_FILES" 2021-03-30 08:54:24 +00:00
Yo Chiang
1fe7d8ccae Merge "Revert^2 "Nextgen release: Don't build super_empty.img"" am: 910d352ee6
Original change: https://android-review.googlesource.com/c/platform/build/+/1652241

Change-Id: I0e6a67d105801f4f82b9d9e4d0b47a37a15d3b6e
2021-03-30 07:10:40 +00:00
Yo Chiang
5e13f508dc Merge "Revert^2 "Add option to allow product makefiles to skip building s..."" am: 3060ba5048
Original change: https://android-review.googlesource.com/c/platform/build/+/1652240

Change-Id: I199e060070997c52f5ef862717f5d78c8af30e41
2021-03-30 07:10:17 +00:00
Yo Chiang
910d352ee6 Merge "Revert^2 "Nextgen release: Don't build super_empty.img"" 2021-03-30 06:29:09 +00:00
Yo Chiang
3060ba5048 Merge "Revert^2 "Add option to allow product makefiles to skip building s..."" 2021-03-30 06:29:09 +00:00
Ulyana Trafimovich
d0f58507ec Merge "Don't enforce <uses-library> checks if dexpreopt for apps is disabled." am: e06dbb7a76
Original change: https://android-review.googlesource.com/c/platform/build/+/1655691

Change-Id: Ib6389db6c8985da92e44ff9f525497a3b2b521e0
2021-03-29 16:57:06 +00:00
Ulyana Trafimovich
e06dbb7a76 Merge "Don't enforce <uses-library> checks if dexpreopt for apps is disabled." 2021-03-29 16:21:24 +00:00
Ulya Trafimovich
03befa00fe Don't enforce <uses-library> checks if dexpreopt for apps is disabled.
Otherwise the check fails, as it depend on non-existent dexpreopt.config
files. This CL fixes broken build cf_x86_phone-userdebug_coverage.

Bug: 183931403
Bug: 132357300
Test: forrest build for cf_x86_phone-userdebug_coverage.
Change-Id: I6f977c1e0c2d2160b1813d2d1c36459f0641235e
2021-03-29 15:01:05 +01:00
Nicolas Geoffray
5bfe9267f8 Preopt apps with updatable boot classpath too.
Test: m
Test: egrep 'ethernet-service[^ ]*odex' out/soong/build.ninja \
    | grep updatable
  # is empty
  egrep 'oat-file=[^ ]*Gallery2[^ ]*odex' out/soong/build.ninja \
    | egrep -o 'Xbootclasspath:[^ ]*' \
    | sed 's/:/\n/g' \
    | grep updatable_bootjars
  # lists updatable boot jars
  egrep -o 'Xbootclasspath:[^ ]*' \
      -o `find out -name dexpreopt.sh | grep Dialer` \
    | sed 's/:/\n/g' \
    | grep updatable_bootjars
  # lists updatable boot jars
Bug: 178467404
Change-Id: Ia5d4e59bac3e32bc77f1a0ab9e1abb18768a7ee7
2021-03-29 14:03:12 +01:00
Yi-Yo Chiang
875442fde4 Remove obsolete var PRODUCT_CHECK_ELF_FILES
After aosp/1184262 is submitted, PRODUCT_CHECK_ELF_FILES is deprecated
and nobody is using this variable anymore.

Bug: 149715904
Test: Presubmit; Should be noop
Change-Id: Iaf4a6ae1fe4062684a9699b7ef999030ff483e16
2021-03-29 18:35:51 +08:00
Bowgo Tsai
b8deb6e684 Merge "GKI: put debugging resources under fisrt_stage_ramdisk subdir." am: bc50bb88e2
Original change: https://android-review.googlesource.com/c/platform/build/+/1652235

Change-Id: Ibc6c3433fdad962883065b242577e271258fd0cd
2021-03-29 03:02:45 +00:00
Bowgo Tsai
bc50bb88e2 Merge "GKI: put debugging resources under fisrt_stage_ramdisk subdir." 2021-03-29 02:25:12 +00:00
Julien Desprez
43c0c9c753 Merge "Mark the unit tests module itself as its component" am: c2e66a69ca
Original change: https://android-review.googlesource.com/c/platform/build/+/1652888

Change-Id: I96459df4ee5a9bd03b84a11403abfa0a775db22b
2021-03-25 22:13:41 +00:00
Jaewoong Jung
f9a2e4d41f Fix the help script.
Test: m help
Change-Id: I5ed6357de4ed4e59d2f1337aefe0104b113869fe
2021-03-25 14:40:44 -07:00
Julien Desprez
c2e66a69ca Merge "Mark the unit tests module itself as its component" 2021-03-25 21:35:29 +00:00
Ulyana Trafimovich
9c33ee6f6a Merge "Disable <uses-library> checks for SDK products." am: 3140fc9e15
Original change: https://android-review.googlesource.com/c/platform/build/+/1652331

Change-Id: Ide6bca3602a5df8fb27d579dd3a21e32db307661
2021-03-25 10:48:56 +00:00
Ulyana Trafimovich
5ee2475ecb Merge "Add config that controls if updatable BCP is included in dexpreopt." am: 86755e4ac0
Original change: https://android-review.googlesource.com/c/platform/build/+/1650448

Change-Id: Icb443b08e1f9ad2b6f70041cc0b321e92bcffd28
2021-03-25 10:48:01 +00:00
Ulyana Trafimovich
3140fc9e15 Merge "Disable <uses-library> checks for SDK products." 2021-03-25 10:14:37 +00:00
Ulyana Trafimovich
86755e4ac0 Merge "Add config that controls if updatable BCP is included in dexpreopt." 2021-03-25 10:13:45 +00:00
Yo Chiang
075a6d3327 Revert^2 "Nextgen release: Don't build super_empty.img"
This reverts commit 63c65c776d.

Reason for revert: Original bug was resolved by updating branch config

Change-Id: I1136570f9bd01d050beb55705cc90040dd396ecc
2021-03-25 10:12:58 +00:00
Yo Chiang
e86bab474b Revert^2 "Add option to allow product makefiles to skip building s..."
This reverts commit ccfea17fb7.

Reason for revert: Original bug was resolved by updating branch config

Change-Id: I2327092261a2147fa8f2be3d878db04228e65511
2021-03-25 10:12:28 +00:00
SzuWei Lin
6ef237b9d0 Export prebuilt-info.txt of perbuilts kernel to dist
aosp_arm64 and gsi_arm64 build the boot.img binaries with prebuilt
kernels.Exporting the prebuilt-info.txt in dist folder makes to
easier to see which kernel build on AndroidCI.

Bug: 183504624
Test: lunch gsi_arm64-userdebug; make -j dist
Change-Id: I18f63af8588ced93e57b9d24e3b196d6f5694e72
2021-03-25 18:03:10 +08:00
Bowgo Tsai
099a7c40a7 GKI: put debugging resources under fisrt_stage_ramdisk subdir.
For consistency with android-11 GKI boot-debug.img, we should
put debug resources under the 'fisrt_stage_ramdisk' dir. This is
needed for devices with `androidboot.force_normal_boot=1` in the
kernel cmdline, where init will chroot into /fisrt_stage_ramdisk.

For devices without force_normal_boot, they still can use their
vendor_boot-debug.img for debugging purpose.

Bug: 183670217
Test: `make bootimage_debug`, then use unpack_bootimg and
      `lz4 -d -c ramdisk | toybox cpio -i` to unpack the ramdisk
      for inspection.
Change-Id: I0a79440dafd091141a1203a2c2c7be5bc1bfc836
2021-03-25 14:24:09 +08:00
Tianjie Xu
402c4f9426 Merge changes from topic "revert-1644988-nextgen-release-img-zip-cleanup-KPBTKCTROS" am: 4b2242de5e
Original change: https://android-review.googlesource.com/c/platform/build/+/1653539

Change-Id: I37eb5237e21d37f049f848eff4c356c092be0d0d
2021-03-25 05:47:31 +00:00
Tianjie Xu
4b2242de5e Merge changes from topic "revert-1644988-nextgen-release-img-zip-cleanup-KPBTKCTROS"
* changes:
  Revert "Add option to allow product makefiles to skip building s..."
  Revert "Nextgen release: Don't build super_empty.img"
2021-03-25 05:13:52 +00:00
Tianjie Xu
63c65c776d Revert "Nextgen release: Don't build super_empty.img"
Revert submission 1644988-nextgen-release-img-zip-cleanup

Reason for revert: b/183654818
Reverted Changes:
I2474e5fd6:Nextgen release: Don't build super_empty.img
I549439528:Add option to allow product makefiles to skip buil...

Change-Id: I91fb23542f7f70b0c1d6d3dabf97c0844956cfb0
2021-03-25 05:00:12 +00:00
Tianjie Xu
ccfea17fb7 Revert "Add option to allow product makefiles to skip building s..."
Revert submission 1644988-nextgen-release-img-zip-cleanup

Reason for revert: b/183654818
Reverted Changes:
I2474e5fd6:Nextgen release: Don't build super_empty.img
I549439528:Add option to allow product makefiles to skip buil...

Change-Id: I711d1c288eed17686b048144d8d41c0fdd5cd8e1
2021-03-25 05:00:12 +00:00
Treehugger Robot
dcacc47ac7 Merge "Add filter to some boolean variables" am: 9ae28a750a
Original change: https://android-review.googlesource.com/c/platform/build/+/1651611

Change-Id: Ie3622abb79714fc4696b9f85ab3e4b164a1e8971
2021-03-24 23:46:38 +00:00
Treehugger Robot
9ae28a750a Merge "Add filter to some boolean variables" 2021-03-24 23:20:53 +00:00
Julien Desprez
19275640fb Mark the unit tests module itself as its component
This will help to try out code coverage reporting.

Change-Id: I52953037cb1482d88102d4bf8719ec7192dfaa97
Test: presubmit
Bug: 172962242
2021-03-24 20:11:49 +00:00
Ulya Trafimovich
918f71acf7 Disable <uses-library> checks for SDK products.
They lack some libraries (e.g. RadioConfigLib), which makes it
impossible to translate their module names to library name, so the check
fails.

Bug: 183339664
Bug: 132357300
Bug: 183616134
Test: treehugger
Change-Id: I2f5f646f0fba054f9ef6a0e45afa2ecc70d5fcf0
2021-03-24 17:14:20 +00:00
Ulyana Trafimovich
e4622cffca Merge "Add PRODUCT_BROKEN_VERIFY_USES_LIBRARIES." am: c79c96ae43
Original change: https://android-review.googlesource.com/c/platform/build/+/1648747

Change-Id: Ie957d322bb79b81abafb9cef11f36e16f0662c90
2021-03-24 15:44:41 +00:00
Ulyana Trafimovich
c79c96ae43 Merge "Add PRODUCT_BROKEN_VERIFY_USES_LIBRARIES." 2021-03-24 15:18:42 +00:00
Ulya Trafimovich
b9f4306adf Add config that controls if updatable BCP is included in dexpreopt.
For now the config is always set to false (updatable boot jars are
excluded), but this may change in the future.

Bug: 178467404
Test: lunch aosp_cf_x86_64_phone-userdebug && m
Change-Id: I1b45a89748e065a29130efbf8b54dddfae69e48b
2021-03-24 10:51:46 +00:00
Inseob Kim
0ae668f236 Merge "Add WithDexpreopt soong variable" am: ce0671f057
Original change: https://android-review.googlesource.com/c/platform/build/+/1650270

Change-Id: I8ea4320ec9e0ed0baf6e4f69b6f475e35cbc00d7
2021-03-24 06:45:31 +00:00
Inseob Kim
ce0671f057 Merge "Add WithDexpreopt soong variable" 2021-03-24 06:20:03 +00:00
Yo Chiang
d26db0e15e Merge changes from topic "nextgen-release-img-zip-cleanup" am: 18015cef3b
Original change: https://android-review.googlesource.com/c/platform/build/+/1644989

Change-Id: I1b9b5e61d2dcc3ceadf12eba57c743a5a78293b6
2021-03-24 06:04:37 +00:00
Yo Chiang
18015cef3b Merge changes from topic "nextgen-release-img-zip-cleanup"
* changes:
  Nextgen release: Don't build super_empty.img
  Add option to allow product makefiles to skip building super_empty.img
2021-03-24 05:35:46 +00:00
Yi-Yo Chiang
16973880c6 Nextgen release: Don't build super_empty.img
Bug: 183068624
Test: "m dist" on GSI and check the build artifacts under OUT and DIST
      directories, and check the contents of *-img-*.zip
Change-Id: I2474e5fd69534a5890eecd0c81e10a583e4423be
2021-03-24 05:35:37 +00:00
Yi-Yo Chiang
ba959a5ff1 Add option to allow product makefiles to skip building super_empty.img
This change doesn't change the condition for building super_empty.img,
it just add a toggle PRODUCT_BUILD_SUPER_EMPTY_IMAGE that product
makefiles can use to skip building super_empty.img.
Products that don't use super_empty at all, for example GSI, can set
this option to ensure the super_empty.img is not built.

Bug: 183068624
Test: "m dist" on GSI and check the build artifacts under OUT and DIST
  directories, and check the contents of *-img-*.zip
Change-Id: I54943952873d2d297fd9d18cbe14742bc12ae9c6
2021-03-24 05:35:10 +00:00
Inseob Kim
3dfb8b8d7a Add filter to some boolean variables
add_json_bool converts non-empty string to true, and empty string to
false. But some of boolean variables are meant to be set either "true"
or "false". In that case "false" may lead to a mismatch. This adds
filter to boolean variables which are directly compared to "true", like

    ifeq ($(VAR),true)

Bug: 183483152
Test: build
Change-Id: I0dc4a05293a3233ae4958335781a19e6445a3799
2021-03-24 14:20:33 +09:00
Inseob Kim
9a9201d32c Merge "Fix SepolicySplit soong variable" am: 26c77daaa4
Original change: https://android-review.googlesource.com/c/platform/build/+/1650269

Change-Id: I3046a037093d0c62bcacab5ee8dd0950b2507ab5
2021-03-24 00:31:05 +00:00
Inseob Kim
26c77daaa4 Merge "Fix SepolicySplit soong variable" 2021-03-23 23:54:29 +00:00
Inseob Kim
84a8be3c52 Add WithDexpreopt soong variable
Test: m selinux_policy on sc-arc
Change-Id: Ieae24f65d74179d0604040a95f8aff4b027a2949
2021-03-23 23:21:24 +00:00
Ulya Trafimovich
1a3b145803 Add PRODUCT_BROKEN_VERIFY_USES_LIBRARIES.
If set to true, it disables <uses-library> checks for a product. It is
possible to override with environment variable RELAX_USES_LIBRARY_CHECK
on the command-line.

Per product configuration is needed rather than per board configuration
(such as BUILD_BROKEN_* variables) because of the specifics of
<uses-library> checks: they depend on the product packages list, and
not on the board config.

One example of a product family that needs to disable the checks are
the SDK builds (e.g. sdk_gphone_x86_64), see b/183339664.

Bug: 183339664
Bug: 132357300
Test: treehugger
Change-Id: Ia58559e4e70163da94e9eb7b8a6133e0cbecd459
2021-03-23 12:36:24 +00:00
Inseob Kim
35f63019c9 Fix SepolicySplit soong variable
It should be "filtered" by "true" because all non-empty values become
true when using add_json_bool.

Test: m selinux_policy on sc-arc
Change-Id: I35d5881d83746230793cf8ced76885607e82334a
2021-03-23 20:47:39 +09:00
Treehugger Robot
a0ece52b29 Merge "Build module-info.json in dist" am: 9657a54894
Original change: https://android-review.googlesource.com/c/platform/build/+/1648028

Change-Id: I94ba1b40950d11877a570416872b4a927f438173
2021-03-23 11:38:59 +00:00