Commit Graph

76049 Commits

Author SHA1 Message Date
Bob Badour
fc26ac07a4 Fix recovery_unit_test
Return to using zip instead of SOONG_ZIP

Bug: 235405168

Test: m droid dist
Change-Id: I6f0f2fa7861bca18e34576c920a3c33ffef6b46e
2022-06-08 17:03:02 -07:00
Treehugger Robot
5c6b4e029b Merge "Fix pitfall: do not delete intermediates dir." 2022-06-07 22:28:40 +00:00
Treehugger Robot
6417dca03f Merge "Remove danielnorman@ from OWNERs." 2022-06-07 21:20:00 +00:00
Daniel Norman
731767c99d Remove danielnorman@ from OWNERs.
Bug: 235251309
Change-Id: I164b4fcd2abbe0bd5a0a73c29887d7804f87544a
2022-06-07 19:26:54 +00:00
Bob Badour
eb9431ee8a Fix pitfall: do not delete intermediates dir.
Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_coral_hwasan TARGET_BUILD_VARIANT=userdebug droid dist with-license platform_tests continuous_instrumentation_tests continuous_native_tests

Change-Id: Ibf1bff6ee67e4958b1e1ea2fbc0385787d3bf0f0
2022-06-07 10:02:12 -07:00
Treehugger Robot
1053d69c1f Merge "Using BOARD_AVB_VBMETA_VENDOR_IMAGE_ARGS for vbmeta_vendor.img" 2022-06-07 16:18:03 +00:00
Bowgo Tsai
c85a201d5e Using BOARD_AVB_VBMETA_VENDOR_IMAGE_ARGS for vbmeta_vendor.img
The value of BOARD_AVB_VBMETA_SYSTEM_IMAGE_ARGS and
BOARD_AVB_VBMETA_VENDOR_IMAGE_ARGS are usually the same, e.g.,
--padding_size 4096 --rollback_index 1656979200.

However, in a split build, the value of
BOARD_AVB_VBMETA_SYSTEM_IMAGE_ARGS might be empty.
Using BOARD_AVB_VBMETA_VENDOR_IMAGE_ARGS to correctly
assign the value for vbmeta_vendor.img.

Bug: 232360330
Test: TreeHugger
Change-Id: Ia26816bd309084c3a4c0df6b9f2f3fc5a28bc31a
2022-06-07 11:36:35 +08:00
Treehugger Robot
10714789a9 Merge "Improve flags for compliance tools." 2022-06-07 00:51:23 +00:00
Ulya Trofimovich
3eff61ca8a Merge "Dexpreopt: prepare to merge class loader context from all deps." 2022-06-06 12:50:34 +00:00
Treehugger Robot
bb8d9ed70f Merge "[Bugfix] Check for presence before ZipWrite" 2022-06-04 05:03:01 +00:00
Bob Badour
986a839161 Improve flags for compliance tools.
Test: m droid dist reportmissinglicenses

Change-Id: I4090dae3d5d33d1908d67dff31aeee92d2b261da
2022-06-03 12:44:22 -07:00
jiangxu5
b67b0d5bc0 [Bugfix] Check for presence before ZipWrite
There are vendor products but no *.map situation

Signed-off-by: jiangxu5 <jiangxu5@xiaomi.com>
Change-Id: I93a710fd10870b7406b1d7beb5a6f51b6badc104
2022-06-03 14:46:56 +08:00
Treehugger Robot
1f0c3583a6 Merge "Create license metadata for copied targets." 2022-06-03 02:05:02 +00:00
Bob Badour
ba3372439f Create license metadata for copied targets.
Bug: 213388645

Test: m cts dist reportmissinglicenses
Change-Id: I43043e5e7b80d9f3210d6498c215846aec761add
2022-06-02 15:43:08 -07:00
Treehugger Robot
f6aae1608d Merge "[Bugfix][Coredump] Fix coredump_enable() in envsetup.sh" 2022-06-02 21:53:40 +00:00
Jooyung Han
154c195e63 Merge "Add same_vndk_variants.timestamp to checkbuild" 2022-06-02 07:42:15 +00:00
Jooyung Han
8c0ece3599 Add same_vndk_variants.timestamp to checkbuild
Before aosp/1851043, it was triggered by checkbuild because the
timestamp is attached to $LOCAL_BUILT_MODULE. With aosp/1851043, the
timestamp is not triggered by checkbuild and when a new VNDK lib is
added the check might get skipped in AOSP tree while it can break in the
downstream trees when actually used.

This change adds the same_vndk_variants.timestamp files to checkbuild
again so that CI catches the errors.

Bug: 233616647
Test: prebuilts/build-tools/linux-x86/bin/ninja -f \
  out/combined-aosp_cf_x86_64_phone.ninja -t query checkbuild \
  | grep same_vndk_variants.timestamp

Change-Id: I26043ec001ca2473fccfc19368d035374c663a21
2022-06-02 11:38:12 +09:00
Melisa Carranza Zúñiga
854f62b430 Merge "Revert "Merge "Adding flags and logic to sign updateable SEPolicy in APEX" am: 77c1dfa6d9 am: 5a0d81a0be am: 54e08307dc"" 2022-06-01 17:08:38 +00:00
Melisa Carranza Zúñiga
8e3198ace3 Revert "Merge "Adding flags and logic to sign updateable SEPolicy in APEX" am: 77c1dfa6d9 am: 5a0d81a0be am: 54e08307dc"
Test: mma and run sign_apex

This reverts commit 8fe9e3a2c7.

Reason for revert: Updateable SEPolicy is punted.

Change-Id: I28ae2afbb1083e215f4e0a27a9164133cd73dd76
Merged-In: I28ae2afbb1083e215f4e0a27a9164133cd73dd76
2022-06-01 12:01:03 +02:00
Melisa Carranza Zúñiga
4449692fa9 Merge "Revert "Merge "Adding sepolicy sign params to sign_target_files_apks." am: fb042449e0 am: bd8c313275 am: a2db49becd"" 2022-05-31 17:46:30 +00:00
Melisa Carranza Zúñiga
da308bf773 Revert "Merge "Adding sepolicy sign params to sign_target_files_apks." am: fb042449e0 am: bd8c313275 am: a2db49becd"
Test: sign_target_files_apks target_files.zip target_out.zip

This reverts commit 6e6c22c70e.

Reason for revert: Updateable SEPolicy is punted.

Change-Id: I99524d13811028a4036aa85c74cf10974fe08165
Merged-In: I99524d13811028a4036aa85c74cf10974fe08165
2022-05-31 09:55:22 +00:00
Anton Hansson
3f65d6d834 Merge "Change default arch for banchan to arm64" 2022-05-31 09:12:24 +00:00
xi yu
addf4833b6 [Bugfix][Coredump] Fix coredump_enable() in envsetup.sh
-P means PID to affect (default $PPID), while -p means Pipe buffer (512 bytes), we should use -P here.

Bug: 234049197

Test: Perform ". build/envsetup.sh" in host, then run "coredump_enable $PID".

Change-Id: Id373f2a7adc56d6a40720ec900b2561c9dbea2b1
2022-05-27 04:58:22 +00:00
Treehugger Robot
d0035d5d88 Merge "Orchestrator can build end to end." 2022-05-27 03:52:34 +00:00
Joe Onorato
c35895676c Orchestrator can build end to end.
This reduces the scope of the demo to just building and installing
a single .so, but it makes the demo actually build that single .so.

Next up, writing some unit tests and fleshing out functionality.

Test: see the README
Change-Id: I560904b786fbf69d3a83dbb08d496dba5a3192ca
2022-05-26 15:11:23 -07:00
Treehugger Robot
fb553d9d41 Merge "Remove fs utilities from init_boot module list" 2022-05-26 18:04:23 +00:00
Kelvin Zhang
ade034f4e9 Remove fs utilities from init_boot module list
These modules aren't actually marked with "ramdisk_avaible: true",
so including them in the generic ramdisk module list don't do anything.
In addition, the generic ramdisk won't have enough space to store
all these modules, because each static executable would be 1MB in size, and init_boot is only 8MB.

Test: th
Change-Id: I589a43ca07d25ffc03a7b72516b329404a92d694
2022-05-26 18:00:32 +00:00
Junfeng Wu
76017c9301 Merge "Use OUT_DIR to find the r8/d8 binaries instead out hard coded out/" 2022-05-26 01:16:44 +00:00
Kelvin Zhang
4117e78575 Merge "Install new snapuserd_ramdisk stem" 2022-05-25 15:39:17 +00:00
Junfeng Wu
6ecd7d177a Use OUT_DIR to find the r8/d8 binaries instead out hard coded out/
Test: USE_RBE=true m
Bug: 233046271

Change-Id: I71d71a3560a97a2173bf415fe8a584ea0c0a5942
2022-05-25 06:29:46 +00:00
Chih-hung Hsieh
c15b738a7c Merge "Add date time, checks on android_root, etc." 2022-05-24 22:53:00 +00:00
Usta Shrestha
0e46244250 Merge "Allow sourcing envsetup from anywhere" 2022-05-24 17:01:12 +00:00
Anton Hansson
0328e32621 Change default arch for banchan to arm64
Devices that only support 32-bit are very uncommon. Default
to the arch that module authors are most likely to be using.

Test: banchan com.android.sdkext | grep TARGET_PRODUCT
Test: banchan com.android.sdkext arm | grep TARGET_PRODUCT
Test: banchan com.android.sdkext arm64 | grep TARGET_PRODUCT
Change-Id: I31734660318eabbe3279214980b5cdecb55ab80b
2022-05-24 15:47:40 +00:00
Ulya Trafimovich
51ad6b81a8 Dexpreopt: prepare to merge class loader context from all deps.
The makefile implementation of dexpreopt is lagging behind the Soong
implementation in the way it handles transitive dependencies: Soong
propagates class loader context through transitive dependencies, such
as static libraries, but makefiles only propagate that information
through uses-library dependencies.

This discrepancy is caused by the difficulty of handling class loader
contexts in makefies: since there is no topological order in handling
module and its dependencies, the information is propagated via file
level dependencies on dexpreopt.configs and merged into the module's
dexpreopt.config with a python script.

To handle transitive dependencies correctly, it is necessary to
generate dexpreopt.config files for all libraries, not just those that
enable dexpreopt.

This change only prepares dex_preopt_odex_install.mk for that and
updates if for corresponding changes in manifest_check.py. It does not
enable generation of dexpreopt.config files for non uses-library
dependencies (e.g. static libraries). This will be done as a follow-up.

Changes:

  - renamed option for dependency dexpreopt.config files
  - added option for self dexpreopt.config
  - moved variable definitions so that they can be used both by
    uses-library check and dexpreopt command
  - add 'Optional' field in makefile-generated dexpreopt.config to
    align it on par with Soong-generated configs
  - modify dex_preopt_config_merger.py to add uses-libraries propagated
    via dexpreopt.config files

Bug: 214255490
Test: lunch aosp_cf_x86_64_phone-userdebug && m && launch_cvd \
    && adb wait-for-device && adb root \
    && adb logcat | grep -E 'ClassLoaderContext [a-z ]+ mismatch'
    # a few unrelated errors caused by missing optional uses-libraries
    #   android.net.ipsec.ike
    #   androidx.window.extensions
    #   androidx.window.sidecar
    # that were present before this patch
Change-Id: I6522319a8415f22f90fc96059a34675fb830e5cc
2022-05-24 16:02:49 +01:00
Usta Shrestha
1433fb357b Allow sourcing envsetup from anywhere
Bug: 232555676
Test: cd build && source envsetup.sh
Change-Id: I8491628406e494f31589249d1cc851b672dd7cae
2022-05-23 18:50:52 +00:00
Treehugger Robot
a3dc792131 Merge "Add a doc about dex_preopt_check." 2022-05-23 10:25:43 +00:00
Treehugger Robot
7668e5a13c Merge "Remove "@1.0-" from android.system.suspend service's name" 2022-05-20 18:49:39 +00:00
Jiakai Zhang
500671f61c Add a doc about dex_preopt_check.
The doc lists some possible causes of a `dex_preopt_check` error, which
can be useful for developers to understand how to debug the error.

Bug: 232542678
Test: m nothing
Change-Id: I2e9868a6a470e41e8c3743c045e0cf4cf7367efa
2022-05-20 16:21:46 +01:00
Anton Hansson
eb483046c0 Merge "Revert^2 "Slim down the sdk product"" 2022-05-20 13:16:13 +00:00
Yi Kong
05b2217940 Merge "Rename modulesAddedWall to modulesWarningsAllowed" 2022-05-20 00:26:18 +00:00
Colin Cross
3bbbe3f04e Merge "Don't depend on art's boot-image-profile.txt in thin manifests" 2022-05-20 00:12:49 +00:00
Chih-Hung Hsieh
dd58ab0dc1 Add date time, checks on android_root, etc.
* Dump current date/time to the output .html file
  to distinguish files from different build dates.
* Guess android_root from the path of warn_common.py,
  but only if it contains build/make and build/soong.
* Do not depend on the TOP variable,
  which is no longer emitted by build/soong make.
* Do not depend on the USE_RBE variables,
  which is not emitted in local makes.

Test: warn.py --url=http://cs/android --separator='?l=' build.log > warnings.html
Test: warn.py --gencsv build.log > warnings.csv
Bug: 198657613
Change-Id: Ib75c60216f9e06f9a768e63b536495fb9658843f
2022-05-19 15:28:41 -07:00
Yi Kong
ee99ddf900 Rename modulesAddedWall to modulesWarningsAllowed
MODULES_ADDED_WALL is deceiving and it actually meant which modules are
allowed to have warnings (do not automatically append -Werror flag).

Test: presubmit
Bug: 233183337
Change-Id: Ia2eb972d3d76ba245840f9872cbcc66d2894dab3
2022-05-19 20:16:00 +08:00
Dmitrii Merkurev
494358dec8 Merge "Introduce EROFS compress hints to the Android build system" 2022-05-19 11:00:11 +00:00
Joe Onorato
9327b9cb4d Merge "Generate ninja files for api assembly and run ninja." 2022-05-19 05:56:48 +00:00
Chih-hung Hsieh
b28e4c2235 Merge "Handle more mixed warning lines from RBE" 2022-05-18 21:31:22 +00:00
Colin Cross
37823d1e6e Don't depend on art's boot-image-profile.txt in thin manifests
Use $(wildcard) to avoid referencing art/build/boot/boot-image-profile.txt
in thin manifests that don't have the art project.

Bug: 207813628
Test: tradefed build
Change-Id: I5d23834f4e8484d2c51b916b6e8395ee23315487
2022-05-18 14:15:59 -07:00
Chih-hung Hsieh
89703b6374 Merge "Add warning type into TopDirs and TopFiles index" 2022-05-18 21:03:32 +00:00
Frederick Mayle
cb577c2efc Remove "@1.0-" from android.system.suspend service's name
Bug: 232447926
Test: TH
Change-Id: If177707ae0459cd3e0521d3b8fba8417c5609c5f
Merged-In: If177707ae0459cd3e0521d3b8fba8417c5609c5f
2022-05-18 20:18:14 +00:00
Anton Hansson
6a6092cab0 Revert^2 "Slim down the sdk product"
8d4de90683

Change-Id: I34ffd88204cb0ee668abf26ecb7bb20f663ef7d9
2022-05-18 14:11:44 +00:00